51271 2010-12-17 12:42:44 -0800 Add a WebPageProxy parameter to the DrawingAreaProxy constructor 2010-12-17 13:07:10 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 323932 0 andersca 2010-12-17 12:42:44 -0800 Add a WebPageProxy parameter to the DrawingAreaProxy constructor 323935 1 76902 andersca 2010-12-17 12:43:59 -0800 Created attachment 76902 Patch 323954 2 andersca 2010-12-17 13:07:10 -0800 Committed r74284: <http://trac.webkit.org/changeset/74284> 76902 2010-12-17 12:43:59 -0800 2010-12-17 13:02:21 -0800 Patch bug-51271-20101217124358.patch text/plain 13521 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg NjlhZTY2MTg1YTYwM2U5OWNiNTMzODIxMzlhYzU5ZDAyN2I3OTQwZC4uMWY5YmJmMDhiNGEwMDcy ZWU5MmUzNGI2OTUyZmJlYTI3MzVjMzgwYyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNCBAQAorMjAxMC0xMi0xNyAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIFdlYlBhZ2VQcm94eSBwYXJhbWV0ZXIg dG8gdGhlIERyYXdpbmdBcmVhUHJveHkgY29uc3RydWN0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxMjcxCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL21hYy9XS1ZpZXcubW06CisgICAgICAgICgtW1dLVmlldyBpbml0V2l0aEZyYW1lOmNvbnRl eHRSZWY6cGFnZUdyb3VwUmVmOl0pOgorICAgICAgICAoLVtXS1ZpZXcgX3N3aXRjaFRvRHJhd2lu Z0FyZWFUeXBlSWZOZWNlc3Nhcnk6RHJhd2luZ0FyZWFJbmZvOjpdKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL3F0L3FncmFwaGljc3drdmlldy5jcHA6CisgICAgICAgIChRR3JhcGhpY3NXS1Zp ZXc6OlFHcmFwaGljc1dLVmlldyk6CisgICAgICAgICogVUlQcm9jZXNzL0NodW5rZWRVcGRhdGVE cmF3aW5nQXJlYVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q2h1bmtlZFVwZGF0ZURyYXdp bmdBcmVhUHJveHk6OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OkNodW5rZWRVcGRhdGVEcmF3 aW5nQXJlYVByb3h5OjpDaHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eSk6CisgICAgICAgICog VUlQcm9jZXNzL0NodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5Lmg6CisgICAgICAgICogVUlQ cm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJl YVByb3h5OjpEcmF3aW5nQXJlYVByb3h5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvRHJhd2luZ0Fy ZWFQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9MYXllckJhY2tlZERyYXdpbmdBcmVhUHJv eHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpMYXllckJhY2tlZERyYXdpbmdBcmVhUHJveHk6OmNy ZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OkxheWVyQmFja2VkRHJhd2luZ0FyZWFQcm94eTo6TGF5 ZXJCYWNrZWREcmF3aW5nQXJlYVByb3h5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvTGF5ZXJCYWNr ZWREcmF3aW5nQXJlYVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1RpbGVkRHJhd2luZ0Fy ZWFQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlRpbGVkRHJhd2luZ0FyZWFQcm94eTo6Y3Jl YXRlKToKKyAgICAgICAgKFdlYktpdDo6VGlsZWREcmF3aW5nQXJlYVByb3h5OjpUaWxlZERyYXdp bmdBcmVhUHJveHkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHku aDoKKyAgICAgICAgKiBVSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3OjpXZWJWaWV3KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6c3dpdGNoVG9E cmF3aW5nQXJlYVR5cGVJZk5lY2Vzc2FyeSk6CisKIDIwMTAtMTItMTYgIERhcmluIEFkbGVyICA8 ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hY2llaiBTdGFjaG93aWFr LgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0gYi9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQppbmRleCAzNTBiMTE2NzNjNWY0ZmMzYzQx ODQ1YmMzNGJhMzNiNGVkNjMwOWRlLi41NjAyNmZhMTlmMTJmYWU3NDlkZmVhZmQ0OWJiOWY0Njg1 NmQ1MmQ2IDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQor KysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQpAQCAtMTUyLDcgKzE1Miw3 IEBAIC0gKGlkKWluaXRXaXRoRnJhbWU6KE5TUmVjdClmcmFtZSBjb250ZXh0UmVmOihXS0NvbnRl eHRSZWYpY29udGV4dFJlZiBwYWdlR3JvdXBSCiAgICAgX2RhdGEtPl9wYWdlQ2xpZW50ID0gUGFn ZUNsaWVudEltcGw6OmNyZWF0ZShzZWxmKTsKICAgICBfZGF0YS0+X3BhZ2UgPSB0b0ltcGwoY29u dGV4dFJlZiktPmNyZWF0ZVdlYlBhZ2UodG9JbXBsKHBhZ2VHcm91cFJlZikpOwogICAgIF9kYXRh LT5fcGFnZS0+c2V0UGFnZUNsaWVudChfZGF0YS0+X3BhZ2VDbGllbnQuZ2V0KCkpOwotICAgIF9k YXRhLT5fcGFnZS0+c2V0RHJhd2luZ0FyZWEoQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHk6 OmNyZWF0ZShzZWxmKSk7CisgICAgX2RhdGEtPl9wYWdlLT5zZXREcmF3aW5nQXJlYShDaHVua2Vk VXBkYXRlRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlKHNlbGYsIF9kYXRhLT5fcGFnZS5nZXQoKSkp OwogICAgIF9kYXRhLT5fcGFnZS0+aW5pdGlhbGl6ZVdlYlBhZ2UoSW50U2l6ZShmcmFtZS5zaXpl KSk7CiAgICAgX2RhdGEtPl9wYWdlLT5zZXRJc0luV2luZG93KFtzZWxmIHdpbmRvd10pOwogCkBA IC0xMTA5LDExICsxMTA5LDExIEBAIC0gKHZvaWQpX3N3aXRjaFRvRHJhd2luZ0FyZWFUeXBlSWZO ZWNlc3Nhcnk6KERyYXdpbmdBcmVhSW5mbzo6VHlwZSl0eXBlCiAgICAgICAgIGNhc2UgRHJhd2lu Z0FyZWFJbmZvOjpOb25lOgogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgRHJhd2lu Z0FyZWFJbmZvOjpDaHVua2VkVXBkYXRlOiB7Ci0gICAgICAgICAgICBuZXdEcmF3aW5nQXJlYSA9 IENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5OjpjcmVhdGUoc2VsZik7CisgICAgICAgICAg ICBuZXdEcmF3aW5nQXJlYSA9IENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5OjpjcmVhdGUo c2VsZiwgX2RhdGEtPl9wYWdlLmdldCgpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9 CiAgICAgICAgIGNhc2UgRHJhd2luZ0FyZWFJbmZvOjpMYXllckJhY2tlZDogewotICAgICAgICAg ICAgbmV3RHJhd2luZ0FyZWEgPSBMYXllckJhY2tlZERyYXdpbmdBcmVhUHJveHk6OmNyZWF0ZShz ZWxmKTsKKyAgICAgICAgICAgIG5ld0RyYXdpbmdBcmVhID0gTGF5ZXJCYWNrZWREcmF3aW5nQXJl YVByb3h5OjpjcmVhdGUoc2VsZiwgX2RhdGEtPl9wYWdlLmdldCgpKTsKICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3FncmFwaGljc3drdmlldy5jcHAgYi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcWdyYXBo aWNzd2t2aWV3LmNwcAppbmRleCBmZjczNDQwZTViMjA5ZDdkMGYzOTBhMzJjNTZhNTk1NGFiYjE4 Y2UxLi5lOThkOGRiZmMwMjAzMGUzN2ViN2QxNzExYzkyOTM1YzdkMTU4MTU0IDEwMDY0NAotLS0g YS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcWdyYXBoaWNzd2t2aWV3LmNwcAorKysgYi9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcWdyYXBoaWNzd2t2aWV3LmNwcApAQCAtNjUsMjAgKzY1LDIx IEBAIFFHcmFwaGljc1dLVmlldzo6UUdyYXBoaWNzV0tWaWV3KFFXS0NvbnRleHQqIGNvbnRleHQs IEJhY2tpbmdTdG9yZVR5cGUgYmFja2luZ1N0CiAKICAgICBQYXNzT3duUHRyPERyYXdpbmdBcmVh UHJveHk+IGRyYXdpbmdBcmVhUHJveHk7CiAKKyAgICBkLT5wYWdlID0gbmV3IFFXS1BhZ2UoY29u dGV4dCk7CisKICAgICBzd2l0Y2ggKGJhY2tpbmdTdG9yZVR5cGUpIHsKICNpZiBFTkFCTEUoVElM RURfQkFDS0lOR19TVE9SRSkKICAgICBjYXNlIFRpbGVkOgotICAgICAgICBkcmF3aW5nQXJlYVBy b3h5ID0gVGlsZWREcmF3aW5nQXJlYVByb3h5OjpjcmVhdGUodGhpcyk7CisgICAgICAgIGRyYXdp bmdBcmVhUHJveHkgPSBUaWxlZERyYXdpbmdBcmVhUHJveHk6OmNyZWF0ZSh0aGlzLCB0b0ltcGwo cGFnZSgpLT5wYWdlUmVmKCkpKTsKICAgICAgICAgY29ubmVjdCh0aGlzLCBTSUdOQUwoc2NhbGVD aGFuZ2VkKCkpLCB0aGlzLCBTTE9UKG9uU2NhbGVDaGFuZ2VkKCkpKTsKICAgICAgICAgYnJlYWs7 CiAjZW5kaWYKICAgICBjYXNlIFNpbXBsZToKICAgICBkZWZhdWx0OgotICAgICAgICBkcmF3aW5n QXJlYVByb3h5ID0gQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHk6OmNyZWF0ZSh0aGlzKTsK KyAgICAgICAgZHJhd2luZ0FyZWFQcm94eSA9IENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5 OjpjcmVhdGUodGhpcywgdG9JbXBsKHBhZ2UoKS0+cGFnZVJlZigpKSk7CiAgICAgICAgIGJyZWFr OwogICAgIH0KIAotICAgIGQtPnBhZ2UgPSBuZXcgUVdLUGFnZShjb250ZXh0KTsKICAgICBkLT5w YWdlLT5kLT5pbml0KHNpemUoKS50b1NpemUoKSwgZHJhd2luZ0FyZWFQcm94eSk7CiAgICAgY29u bmVjdChkLT5wYWdlLCBTSUdOQUwodGl0bGVDaGFuZ2VkKFFTdHJpbmcpKSwgdGhpcywgU0lHTkFM KHRpdGxlQ2hhbmdlZChRU3RyaW5nKSkpOwogICAgIGNvbm5lY3QoZC0+cGFnZSwgU0lHTkFMKGxv YWRTdGFydGVkKCkpLCB0aGlzLCBTSUdOQUwobG9hZFN0YXJ0ZWQoKSkpOwpkaWZmIC0tZ2l0IGEv V2ViS2l0Mi9VSVByb2Nlc3MvQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHkuY3BwIGIvV2Vi S2l0Mi9VSVByb2Nlc3MvQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHkuY3BwCmluZGV4IDgw MGZmZWYwNTRmMzNjMWUwMWVkMjU3MmVmZjAzZGM0OTViNWRiMGYuLmRjMGE5Y2VmYjgzNGY1YTBm ZTUwNmZmZjllZTgzY2YyYWU4Y2VkYzIgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNzL0No dW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5LmNwcAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9D aHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eS5jcHAKQEAgLTM3LDEzICszNywxMyBAQCB1c2lu ZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVBhc3NPd25QdHI8 Q2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHk+IENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVBy b3h5OjpjcmVhdGUoUGxhdGZvcm1XZWJWaWV3KiB3ZWJWaWV3KQorUGFzc093blB0cjxDaHVua2Vk VXBkYXRlRHJhd2luZ0FyZWFQcm94eT4gQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHk6OmNy ZWF0ZShQbGF0Zm9ybVdlYlZpZXcqIHdlYlZpZXcsIFdlYlBhZ2VQcm94eSogd2ViUGFnZVByb3h5 KQogewotICAgIHJldHVybiBhZG9wdFB0cihuZXcgQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJv eHkod2ViVmlldykpOworICAgIHJldHVybiBhZG9wdFB0cihuZXcgQ2h1bmtlZFVwZGF0ZURyYXdp bmdBcmVhUHJveHkod2ViVmlldywgd2ViUGFnZVByb3h5KSk7CiB9CiAKLUNodW5rZWRVcGRhdGVE cmF3aW5nQXJlYVByb3h5OjpDaHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eShQbGF0Zm9ybVdl YlZpZXcqIHdlYlZpZXcpCi0gICAgOiBEcmF3aW5nQXJlYVByb3h5KERyYXdpbmdBcmVhSW5mbzo6 Q2h1bmtlZFVwZGF0ZSkKK0NodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5OjpDaHVua2VkVXBk YXRlRHJhd2luZ0FyZWFQcm94eShQbGF0Zm9ybVdlYlZpZXcqIHdlYlZpZXcsIFdlYlBhZ2VQcm94 eSogd2ViUGFnZVByb3h5KQorICAgIDogRHJhd2luZ0FyZWFQcm94eShEcmF3aW5nQXJlYUluZm86 OkNodW5rZWRVcGRhdGUsIHdlYlBhZ2VQcm94eSkKICAgICAsIG1faXNXYWl0aW5nRm9yRGlkU2V0 RnJhbWVOb3RpZmljYXRpb24oZmFsc2UpCiAgICAgLCBtX2lzVmlzaWJsZSh0cnVlKQogICAgICwg bV9mb3JjZVJlcGFpbnRXaGVuUmVzdW1pbmdQYWludGluZyhmYWxzZSkKZGlmZiAtLWdpdCBhL1dl YktpdDIvVUlQcm9jZXNzL0NodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5LmggYi9XZWJLaXQy L1VJUHJvY2Vzcy9DaHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eS5oCmluZGV4IDQ3YjUzNTcx NDM1MThjNDQzNjEzMzE0ZTQxNmYxNThmMWM1NWEyMzkuLjU4OWQzYzExZGFjMmQzMjJmNDM0OGFh MzAxYjIwZjM4ZDFmY2Q4YWQgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNzL0NodW5rZWRV cGRhdGVEcmF3aW5nQXJlYVByb3h5LmgKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQ2h1bmtlZFVw ZGF0ZURyYXdpbmdBcmVhUHJveHkuaApAQCAtNTcsMTIgKzU3LDEyIEBAIHR5cGVkZWYgUUdyYXBo aWNzV0tWaWV3IFBsYXRmb3JtV2ViVmlldzsKIAogY2xhc3MgQ2h1bmtlZFVwZGF0ZURyYXdpbmdB cmVhUHJveHkgOiBwdWJsaWMgRHJhd2luZ0FyZWFQcm94eSB7CiBwdWJsaWM6Ci0gICAgc3RhdGlj IFBhc3NPd25QdHI8Q2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZShQbGF0Zm9y bVdlYlZpZXcqKTsKKyAgICBzdGF0aWMgUGFzc093blB0cjxDaHVua2VkVXBkYXRlRHJhd2luZ0Fy ZWFQcm94eT4gY3JlYXRlKFBsYXRmb3JtV2ViVmlldyosIFdlYlBhZ2VQcm94eSopOwogCiAgICAg dmlydHVhbCB+Q2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHkoKTsKIAogcHJpdmF0ZToKLSAg ICBDaHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eShQbGF0Zm9ybVdlYlZpZXcqKTsKKyAgICBD aHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eShQbGF0Zm9ybVdlYlZpZXcqLCBXZWJQYWdlUHJv eHkqKTsKIAogICAgIFdlYlBhZ2VQcm94eSogcGFnZSgpOwogCmRpZmYgLS1naXQgYS9XZWJLaXQy L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmNwcCBiL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdp bmdBcmVhUHJveHkuY3BwCmluZGV4IDBkZDA2NmNjNDMzYjU3ZmIzNjRmNTVlOWY2ZDhlZWY5MTdi MDgwNTQuLjE1YWUzZmRlNDI5NzhlNmY1YzIzNmJhOGI2OTBkOWJkZTA4Yjc3OGUgMTAwNjQ0Ci0t LSBhL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuY3BwCisrKyBiL1dlYktpdDIv VUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuY3BwCkBAIC0yNyw4ICsyNyw5IEBACiAKIG5hbWVz cGFjZSBXZWJLaXQgewogCi1EcmF3aW5nQXJlYVByb3h5OjpEcmF3aW5nQXJlYVByb3h5KERyYXdp bmdBcmVhSW5mbzo6VHlwZSB0eXBlKQorRHJhd2luZ0FyZWFQcm94eTo6RHJhd2luZ0FyZWFQcm94 eShEcmF3aW5nQXJlYUluZm86OlR5cGUgdHlwZSwgV2ViUGFnZVByb3h5KiB3ZWJQYWdlUHJveHkp CiAgICAgOiBtX2luZm8odHlwZSwgbmV4dElkZW50aWZpZXIoKSkKKyAgICAsIG1fd2ViUGFnZVBy b3h5KHdlYlBhZ2VQcm94eSkKIHsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3Mv RHJhd2luZ0FyZWFQcm94eS5oIGIvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5o CmluZGV4IGYzOGVmYzZmNmY1YWRkOWE1ZWNhNjZkMjU4YjIwZGY4NDRmYWRiODMuLjEwOTNiNWIz ZGQ3Y2M5NTJkYWI2OTI1NjNiOWQ2YmYyYTBjYTYzNmUgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQ cm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5n QXJlYVByb3h5LmgKQEAgLTM1LDYgKzM1LDggQEAgY2xhc3MgUVBhaW50ZXI7CiAKIG5hbWVzcGFj ZSBXZWJLaXQgewogCitjbGFzcyBXZWJQYWdlUHJveHk7CisKICNpZiBQTEFURk9STShNQUMpCiB0 eXBlZGVmIENHQ29udGV4dFJlZiBQbGF0Zm9ybURyYXdpbmdDb250ZXh0OwogI2VsaWYgUExBVEZP Uk0oV0lOKQpAQCAtNjYsOSArNjgsMTEgQEAgcHVibGljOgogICAgIGNvbnN0IERyYXdpbmdBcmVh SW5mbyYgaW5mbygpIGNvbnN0IHsgcmV0dXJuIG1faW5mbzsgfQogCiBwcm90ZWN0ZWQ6Ci0gICAg ZXhwbGljaXQgRHJhd2luZ0FyZWFQcm94eShEcmF3aW5nQXJlYUluZm86OlR5cGUpOworICAgIGV4 cGxpY2l0IERyYXdpbmdBcmVhUHJveHkoRHJhd2luZ0FyZWFJbmZvOjpUeXBlLCBXZWJQYWdlUHJv eHkqKTsKIAogICAgIERyYXdpbmdBcmVhSW5mbyBtX2luZm87CisgICAgV2ViUGFnZVByb3h5KiBt X3dlYlBhZ2VQcm94eTsKKwogICAgIFdlYkNvcmU6OkludFNpemUgbV9zaXplOwogfTsKIApkaWZm IC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvTGF5ZXJCYWNrZWREcmF3aW5nQXJlYVByb3h5LmNw cCBiL1dlYktpdDIvVUlQcm9jZXNzL0xheWVyQmFja2VkRHJhd2luZ0FyZWFQcm94eS5jcHAKaW5k ZXggMDA5NTRkZmQ5ODA2NjU3MjhiYmI4YzhjZTczZTI2Njk0OGY1YjQ4Ni4uNDZlMTIwNzJjYzUx OTgzZDAzNzk3YzYwMjFjMjcwZWU1NWNjY2EzMCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nl c3MvTGF5ZXJCYWNrZWREcmF3aW5nQXJlYVByb3h5LmNwcAorKysgYi9XZWJLaXQyL1VJUHJvY2Vz cy9MYXllckJhY2tlZERyYXdpbmdBcmVhUHJveHkuY3BwCkBAIC0zOCwxMyArMzgsMTMgQEAgdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1QYXNzT3duUHRy PExheWVyQmFja2VkRHJhd2luZ0FyZWFQcm94eT4gTGF5ZXJCYWNrZWREcmF3aW5nQXJlYVByb3h5 OjpjcmVhdGUoUGxhdGZvcm1XZWJWaWV3KiB3ZWJWaWV3KQorUGFzc093blB0cjxMYXllckJhY2tl ZERyYXdpbmdBcmVhUHJveHk+IExheWVyQmFja2VkRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlKFBs YXRmb3JtV2ViVmlldyogd2ViVmlldywgV2ViUGFnZVByb3h5KiB3ZWJQYWdlUHJveHkpCiB7Ci0g ICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBMYXllckJhY2tlZERyYXdpbmdBcmVhUHJveHkod2ViVmll dykpOworICAgIHJldHVybiBhZG9wdFB0cihuZXcgTGF5ZXJCYWNrZWREcmF3aW5nQXJlYVByb3h5 KHdlYlZpZXcsIHdlYlBhZ2VQcm94eSkpOwogfQogCi1MYXllckJhY2tlZERyYXdpbmdBcmVhUHJv eHk6OkxheWVyQmFja2VkRHJhd2luZ0FyZWFQcm94eShQbGF0Zm9ybVdlYlZpZXcqIHdlYlZpZXcp Ci0gICAgOiBEcmF3aW5nQXJlYVByb3h5KERyYXdpbmdBcmVhSW5mbzo6TGF5ZXJCYWNrZWQpCitM YXllckJhY2tlZERyYXdpbmdBcmVhUHJveHk6OkxheWVyQmFja2VkRHJhd2luZ0FyZWFQcm94eShQ bGF0Zm9ybVdlYlZpZXcqIHdlYlZpZXcsIFdlYlBhZ2VQcm94eSogd2ViUGFnZVByb3h5KQorICAg IDogRHJhd2luZ0FyZWFQcm94eShEcmF3aW5nQXJlYUluZm86OkxheWVyQmFja2VkLCB3ZWJQYWdl UHJveHkpCiAgICAgLCBtX2lzV2FpdGluZ0ZvckRpZFNldEZyYW1lTm90aWZpY2F0aW9uKGZhbHNl KQogICAgICwgbV9pc1Zpc2libGUodHJ1ZSkKICAgICAsIG1fd2ViVmlldyh3ZWJWaWV3KQpkaWZm IC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvTGF5ZXJCYWNrZWREcmF3aW5nQXJlYVByb3h5Lmgg Yi9XZWJLaXQyL1VJUHJvY2Vzcy9MYXllckJhY2tlZERyYXdpbmdBcmVhUHJveHkuaAppbmRleCBm NzQ5OWQ2NzdhYWVkMDQ3MDA4OTI5NGQxODZjMGE4Y2NjOTBlYWI0Li5lOTNkYjg3ZDMzZDI0ODUx Y2JiNmIwMmQ5MGQwMGM3YWY2YTUwOTMxIDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9M YXllckJhY2tlZERyYXdpbmdBcmVhUHJveHkuaAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9MYXll ckJhY2tlZERyYXdpbmdBcmVhUHJveHkuaApAQCAtNTUsMTEgKzU1LDExIEBAIHR5cGVkZWYgV2Vi VmlldyBQbGF0Zm9ybVdlYlZpZXc7CiAKIGNsYXNzIExheWVyQmFja2VkRHJhd2luZ0FyZWFQcm94 eSA6IHB1YmxpYyBEcmF3aW5nQXJlYVByb3h5IHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUGFzc093 blB0cjxMYXllckJhY2tlZERyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZShQbGF0Zm9ybVdlYlZpZXcq KTsKKyAgICBzdGF0aWMgUGFzc093blB0cjxMYXllckJhY2tlZERyYXdpbmdBcmVhUHJveHk+IGNy ZWF0ZShQbGF0Zm9ybVdlYlZpZXcqLCBXZWJQYWdlUHJveHkqKTsKICAgICB2aXJ0dWFsIH5MYXll ckJhY2tlZERyYXdpbmdBcmVhUHJveHkoKTsKIAogcHJpdmF0ZToKLSAgICBMYXllckJhY2tlZERy YXdpbmdBcmVhUHJveHkoUGxhdGZvcm1XZWJWaWV3Kik7CisgICAgTGF5ZXJCYWNrZWREcmF3aW5n QXJlYVByb3h5KFBsYXRmb3JtV2ViVmlldyosIFdlYlBhZ2VQcm94eSopOwogCiAgICAgV2ViUGFn ZVByb3h5KiBwYWdlKCk7CiAKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL1RpbGVkRHJh d2luZ0FyZWFQcm94eS5jcHAgYi9XZWJLaXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJv eHkuY3BwCmluZGV4IGE1ZDJkZTRkYmI2NDUwZGFkZDBkYTI3OTMyNTFiMzk5MzE4NmRkYTAuLjdj NGE0YTdlZWQ1YzVlYTQ2NmQyM2IzZDhiN2E1Y2I0MWYwZGUwNDAgMTAwNjQ0Ci0tLSBhL1dlYktp dDIvVUlQcm9jZXNzL1RpbGVkRHJhd2luZ0FyZWFQcm94eS5jcHAKKysrIGIvV2ViS2l0Mi9VSVBy b2Nlc3MvVGlsZWREcmF3aW5nQXJlYVByb3h5LmNwcApAQCAtNDEsMTMgKzQxLDEzIEBAIG5hbWVz cGFjZSBXZWJLaXQgewogc3RhdGljIGNvbnN0IGludCBkZWZhdWx0VGlsZVdpZHRoID0gMTAyNDsK IHN0YXRpYyBjb25zdCBpbnQgZGVmYXVsdFRpbGVIZWlnaHQgPSAxMDI0OwogCi1QYXNzT3duUHRy PFRpbGVkRHJhd2luZ0FyZWFQcm94eT4gVGlsZWREcmF3aW5nQXJlYVByb3h5OjpjcmVhdGUoUGxh dGZvcm1XZWJWaWV3KiB3ZWJWaWV3KQorUGFzc093blB0cjxUaWxlZERyYXdpbmdBcmVhUHJveHk+ IFRpbGVkRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlKFBsYXRmb3JtV2ViVmlldyogd2ViVmlldywg V2ViUGFnZVByb3h5KiB3ZWJQYWdlUHJveHkpCiB7Ci0gICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBU aWxlZERyYXdpbmdBcmVhUHJveHkod2ViVmlldykpOworICAgIHJldHVybiBhZG9wdFB0cihuZXcg VGlsZWREcmF3aW5nQXJlYVByb3h5KHdlYlZpZXcsIHdlYlBhZ2VQcm94eSkpOwogfQogCi1UaWxl ZERyYXdpbmdBcmVhUHJveHk6OlRpbGVkRHJhd2luZ0FyZWFQcm94eShQbGF0Zm9ybVdlYlZpZXcq IHdlYlZpZXcpCi0gICAgOiBEcmF3aW5nQXJlYVByb3h5KERyYXdpbmdBcmVhSW5mbzo6VGlsZWQp CitUaWxlZERyYXdpbmdBcmVhUHJveHk6OlRpbGVkRHJhd2luZ0FyZWFQcm94eShQbGF0Zm9ybVdl YlZpZXcqIHdlYlZpZXcsIFdlYlBhZ2VQcm94eSogd2ViUGFnZVByb3h5KQorICAgIDogRHJhd2lu Z0FyZWFQcm94eShEcmF3aW5nQXJlYUluZm86OlRpbGVkLCB3ZWJQYWdlUHJveHkpCiAgICAgLCBt X2lzV2FpdGluZ0ZvckRpZFNldEZyYW1lTm90aWZpY2F0aW9uKGZhbHNlKQogICAgICwgbV9pc1Zp c2libGUodHJ1ZSkKICAgICAsIG1fd2ViVmlldyh3ZWJWaWV3KQpkaWZmIC0tZ2l0IGEvV2ViS2l0 Mi9VSVByb2Nlc3MvVGlsZWREcmF3aW5nQXJlYVByb3h5LmggYi9XZWJLaXQyL1VJUHJvY2Vzcy9U aWxlZERyYXdpbmdBcmVhUHJveHkuaAppbmRleCAzYjlhNTU4MTk4ODQwZDQ0MGVhOGRjZjZkMjY1 NTY1ZTVmYTM0ZDdhLi44ZmY2MzEyMDgyOTUyZGQxMzc2M2ExNWY5YzJjZjg3N2E2NjJjYjBlIDEw MDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuaAorKysg Yi9XZWJLaXQyL1VJUHJvY2Vzcy9UaWxlZERyYXdpbmdBcmVhUHJveHkuaApAQCAtNjUsOSArNjUs OSBAQCB0eXBlZGVmIFFHcmFwaGljc1dLVmlldyBQbGF0Zm9ybVdlYlZpZXc7CiAKIGNsYXNzIFRp bGVkRHJhd2luZ0FyZWFQcm94eSA6IHB1YmxpYyBEcmF3aW5nQXJlYVByb3h5IHsKIHB1YmxpYzoK LSAgICBzdGF0aWMgUGFzc093blB0cjxUaWxlZERyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZShQbGF0 Zm9ybVdlYlZpZXcqIHdlYlZpZXcpOworICAgIHN0YXRpYyBQYXNzT3duUHRyPFRpbGVkRHJhd2lu Z0FyZWFQcm94eT4gY3JlYXRlKFBsYXRmb3JtV2ViVmlldyogd2ViVmlldywgV2ViUGFnZVByb3h5 Kik7CiAKLSAgICBUaWxlZERyYXdpbmdBcmVhUHJveHkoUGxhdGZvcm1XZWJWaWV3Kik7CisgICAg VGlsZWREcmF3aW5nQXJlYVByb3h5KFBsYXRmb3JtV2ViVmlldyosIFdlYlBhZ2VQcm94eSopOwog ICAgIHZpcnR1YWwgflRpbGVkRHJhd2luZ0FyZWFQcm94eSgpOwogCiAgICAgZmxvYXQgY29udGVu dHNTY2FsZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudHNTY2FsZTsgfQpkaWZmIC0tZ2l0IGEv V2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwIGIvV2ViS2l0Mi9VSVByb2Nlc3Mvd2lu L1dlYlZpZXcuY3BwCmluZGV4IGY3MzgyNmZmZTY0N2NmNmRhN2VlMzA5YzEzYmRmNGY2YWMxMjll ZWMuLjVkOTkyNjJlNjk0ZjE5YmJiNTNjMTRjZTA0YmI2YjJhMmQ0NWRkYzggMTAwNjQ0Ci0tLSBh L1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAorKysgYi9XZWJLaXQyL1VJUHJvY2Vz cy93aW4vV2ViVmlldy5jcHAKQEAgLTIzNSw3ICsyMzUsNyBAQCBXZWJWaWV3OjpXZWJWaWV3KFJF Q1QgcmVjdCwgV2ViQ29udGV4dCogY29udGV4dCwgV2ViUGFnZUdyb3VwKiBwYWdlR3JvdXAsIEhX TkQgcAogCiAgICAgbV9wYWdlID0gY29udGV4dC0+Y3JlYXRlV2ViUGFnZShwYWdlR3JvdXApOwog ICAgIG1fcGFnZS0+c2V0UGFnZUNsaWVudCh0aGlzKTsKLSAgICBtX3BhZ2UtPnNldERyYXdpbmdB cmVhKENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5OjpjcmVhdGUodGhpcykpOworICAgIG1f cGFnZS0+c2V0RHJhd2luZ0FyZWEoQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHk6OmNyZWF0 ZSh0aGlzLCBtX3BhZ2UuZ2V0KCkpKTsKIAogICAgIG1fd2luZG93ID0gOjpDcmVhdGVXaW5kb3dF eCgwLCBrV2ViS2l0MldlYlZpZXdXaW5kb3dDbGFzc05hbWUsIDAsIFdTX0NISUxEIHwgV1NfQ0xJ UFNJQkxJTkdTIHwgV1NfQ0xJUENISUxEUkVOLAogICAgICAgICBtX3JlY3QudG9wLCBtX3JlY3Qu bGVmdCwgbV9yZWN0LnJpZ2h0IC0gbV9yZWN0LmxlZnQsIG1fcmVjdC5ib3R0b20gLSBtX3JlY3Qu dG9wLCBwYXJlbnRXaW5kb3cgPyBwYXJlbnRXaW5kb3cgOiBIV05EX01FU1NBR0UsIDAsIGluc3Rh bmNlSGFuZGxlKCksIHRoaXMpOwpAQCAtOTc3LDEwICs5NzcsMTAgQEAgdm9pZCBXZWJWaWV3Ojpz d2l0Y2hUb0RyYXdpbmdBcmVhVHlwZUlmTmVjZXNzYXJ5KERyYXdpbmdBcmVhSW5mbzo6VHlwZSB0 eXBlKQogICAgICAgICBjYXNlIERyYXdpbmdBcmVhSW5mbzo6Tm9uZToKICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICBjYXNlIERyYXdpbmdBcmVhSW5mbzo6Q2h1bmtlZFVwZGF0ZToKLSAgICAg ICAgICAgIG5ld0RyYXdpbmdBcmVhID0gQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHk6OmNy ZWF0ZSh0aGlzKTsKKyAgICAgICAgICAgIG5ld0RyYXdpbmdBcmVhID0gQ2h1bmtlZFVwZGF0ZURy YXdpbmdBcmVhUHJveHk6OmNyZWF0ZSh0aGlzLCBtX3BhZ2UuZ2V0KCkpOwogICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgIGNhc2UgRHJhd2luZ0FyZWFJbmZvOjpMYXllckJhY2tlZDoKLSAgICAg ICAgICAgIG5ld0RyYXdpbmdBcmVhID0gTGF5ZXJCYWNrZWREcmF3aW5nQXJlYVByb3h5OjpjcmVh dGUodGhpcyk7CisgICAgICAgICAgICBuZXdEcmF3aW5nQXJlYSA9IExheWVyQmFja2VkRHJhd2lu Z0FyZWFQcm94eTo6Y3JlYXRlKHRoaXMsIG1fcGFnZS5nZXQoKSk7CiAgICAgICAgICAgICBicmVh azsKICAgICB9CiAK