111913 2013-03-08 18:41:55 -0800 [chromium] Helper Plugin does not have a URL for its Document 2013-03-09 08:56:54 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ddorwin ddorwin abarth eric.carlson feature-media-reviews jer.noble tkent webkit.review.bot oldest_to_newest 851672 0 ddorwin 2013-03-08 18:41:55 -0800 WebHelperPluginImpl creates a Document using DocumentWriter, but it does not provide a URL to begin(). As a result, the Document does not have a URL, meaning the browser cannot make decisions based on the host. Since the Helper Plugin is working on behalf or an element, it should have the same origin as the element. 851678 1 192325 ddorwin 2013-03-08 18:57:39 -0800 Created attachment 192325 Patch 851687 2 192325 abarth 2013-03-08 20:04:05 -0800 Comment on attachment 192325 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=192325&action=review > Source/WebKit/chromium/src/WebHelperPluginImpl.cpp:67 > + // Give the new document the same URL as the hose frame so that content > + // settings and other decisions can be made based on the correct origin. > + const WebURL& hostFrameURL = hostFrame->document().url(); Why do we pass in a hostFrame instead of a hostDocument? > Source/WebKit/chromium/src/WebHelperPluginImpl.cpp:71 > + writer.begin(hostFrameURL); Frames don't have URLs. Documents have URLs. > Source/WebKit/chromium/src/WebViewImpl.cpp:168 > + > + These changes look spurious. 851691 3 192329 ddorwin 2013-03-08 20:27:27 -0800 Created attachment 192329 Patch 851697 4 192325 ddorwin 2013-03-08 20:31:13 -0800 Comment on attachment 192325 Patch Thanks. Any concerns about how |url| is used while creating the Document or during its lifetime? During creation, it seems to mostly be important whether it is a plugin (i.e. foo.swf), which is not the case here. View in context: https://bugs.webkit.org/attachment.cgi?id=192325&action=review >> Source/WebKit/chromium/src/WebHelperPluginImpl.cpp:67 >> + const WebURL& hostFrameURL = hostFrame->document().url(); > > Why do we pass in a hostFrame instead of a hostDocument? Done. No reason really. Now, it's a const ref, which is nice. >> Source/WebKit/chromium/src/WebHelperPluginImpl.cpp:71 >> + writer.begin(hostFrameURL); > > Frames don't have URLs. Documents have URLs. Done. >> Source/WebKit/chromium/src/WebViewImpl.cpp:168 >> + > > These changes look spurious. Done. 851787 5 192329 abarth 2013-03-09 08:36:18 -0800 Comment on attachment 192329 Patch ok 851791 6 192329 webkit.review.bot 2013-03-09 08:56:51 -0800 Comment on attachment 192329 Patch Clearing flags on attachment: 192329 Committed r145319: <http://trac.webkit.org/changeset/145319> 851792 7 webkit.review.bot 2013-03-09 08:56:54 -0800 All reviewed patches have been landed. Closing bug. 192325 2013-03-08 18:57:39 -0800 2013-03-08 20:31:13 -0800 Patch bug-111913-20130308185342.patch text/plain 8208 ddorwin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MjIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGJmYmEwZjdkYjUwM2Y0NDIzZDA4Y2ViZmFmYzU1ODRiZmJjNjRkMDcuLmMyNTUzN2ZiYTFlNDNk OThiMjQ5ZjUzNzEzMjk0MzQyMDlhMDQwZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTMtMDMtMDggIERhdmlkIERvcndpbiAgPGRkb3J3aW5AY2hyb21p dW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gU2V0IHRoZSBIZWxwZXIgUGx1Z2luJ3MgVVJM IHRvIHRoYXQgb2YgdGhlIGhvc3QgZnJhbWUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE5MTMKKworICAgICAgICBUaGlzIGFsbG93cyBjb250ZW50 IHNldHRpbmdzLCBldGMuIHRvIGJlIGJhc2VkIG9uIHRoZSBmcmFtZSBob3N0aW5nIHRoZQorICAg ICAgICBlbGVtZW50IHRoYXQgcmVxdWVzdGVkIHRoZSBIZWxwZXIgUGx1Z2luLgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3JjL1dlYkhlbHBlclBs dWdpbkltcGwuY3BwOgorICAgICAgICAoV2ViS2l0Ojp3cml0ZURvY3VtZW50KToKKyAgICAgICAg KFdlYktpdDo6V2ViSGVscGVyUGx1Z2luSW1wbDo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChXZWJL aXQ6OldlYkhlbHBlclBsdWdpbkltcGw6OmluaXRpYWxpemVQYWdlKToKKyAgICAgICAgKiBzcmMv V2ViSGVscGVyUGx1Z2luSW1wbC5oOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYkhl bHBlclBsdWdpbkltcGwpOgorICAgICAgICAqIHNyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OmNyZWF0ZUhl bHBlclBsdWdpbik6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViVmlld0ltcGw6OmNyZWF0ZUhlbHBlclBsdWdpbik6CisgICAgICAgICogc3JjL1dl YlZpZXdJbXBsLmg6CisgICAgICAgIChXZWJWaWV3SW1wbCk6CisKIDIwMTMtMDMtMDcgIEtlaXNo aSBIYXR0b3JpICA8a2Vpc2hpQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVXBkYXRlIGNhbGVuZGFy IHBpY2tlciBVSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSGVs cGVyUGx1Z2luSW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJIZWxwZXJQ bHVnaW5JbXBsLmNwcAppbmRleCA0MDEyMWRhNDkzZGNkYjQ0OWU1OGI2MGI1ZDRiNTYwMDRhYTY5 YWIyLi41NTc1N2ViMTEwMmNkMWRjODhjYzJiYTEzNmMxMTliZDFkNzBiZjQyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJIZWxwZXJQbHVnaW5JbXBsLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJIZWxwZXJQbHVnaW5JbXBsLmNwcApAQCAt NDAsNiArNDAsNyBAQAogI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJQYWdlV2lkZ2V0RGVs ZWdhdGUuaCIKICNpbmNsdWRlICJTZXR0aW5ncy5oIgorI2luY2x1ZGUgIldlYkRvY3VtZW50Lmgi CiAjaW5jbHVkZSAiV2ViRnJhbWVJbXBsLmgiCiAjaW5jbHVkZSAiV2ViUGx1Z2luLmgiCiAjaW5j bHVkZSAiV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oIgpAQCAtNTksMTEgKzYwLDE1IEBAIHN0YXRp YyBpbmxpbmUgdm9pZCBhZGRTdHJpbmcoY29uc3QgU3RyaW5nJiBzdHIsIERvY3VtZW50V3JpdGVy JiB3cml0ZXIpCiAgICAgd3JpdGVyLmFkZERhdGEoc3RyOC5kYXRhKCksIHN0cjgubGVuZ3RoKCkp OwogfQogCi12b2lkIHdyaXRlRG9jdW1lbnQoV2ViQ29yZTo6RG9jdW1lbnRXcml0ZXImIHdyaXRl ciwgY29uc3QgU3RyaW5nJiBwbHVnaW5UeXBlKQordm9pZCB3cml0ZURvY3VtZW50KGNvbnN0IFN0 cmluZyYgcGx1Z2luVHlwZSwgV2ViRnJhbWUqIGhvc3RGcmFtZSwgV2ViQ29yZTo6RG9jdW1lbnRX cml0ZXImIHdyaXRlcikKIHsKKyAgICAvLyBHaXZlIHRoZSBuZXcgZG9jdW1lbnQgdGhlIHNhbWUg VVJMIGFzIHRoZSBob3NlIGZyYW1lIHNvIHRoYXQgY29udGVudAorICAgIC8vIHNldHRpbmdzIGFu ZCBvdGhlciBkZWNpc2lvbnMgY2FuIGJlIG1hZGUgYmFzZWQgb24gdGhlIGNvcnJlY3Qgb3JpZ2lu LgorICAgIGNvbnN0IFdlYlVSTCYgaG9zdEZyYW1lVVJMID0gaG9zdEZyYW1lLT5kb2N1bWVudCgp LnVybCgpOworCiAgICAgd3JpdGVyLnNldE1JTUVUeXBlKCJ0ZXh0L2h0bWwiKTsKICAgICB3cml0 ZXIuc2V0RW5jb2RpbmcoIlVURi04IiwgZmFsc2UpOwotICAgIHdyaXRlci5iZWdpbigpOworICAg IHdyaXRlci5iZWdpbihob3N0RnJhbWVVUkwpOwogCiAgICAgYWRkTGl0ZXJhbCgiPCFET0NUWVBF IGh0bWw+PGhlYWQ+PG1ldGEgY2hhcnNldD0nVVRGLTgnPjwvaGVhZD48Ym9keT5cbiIsIHdyaXRl cik7CiAgICAgU3RyaW5nIG9iamVjdFRhZyA9ICI8b2JqZWN0IHR5cGU9XCIiICsgcGx1Z2luVHlw ZSArICJcIj48L29iamVjdD4iOwpAQCAtMTE1LDEyICsxMjAsMTIgQEAgV2ViSGVscGVyUGx1Z2lu SW1wbDo6fldlYkhlbHBlclBsdWdpbkltcGwoKQogICAgIEFTU0VSVCghbV9wYWdlKTsKIH0KIAot Ym9vbCBXZWJIZWxwZXJQbHVnaW5JbXBsOjppbml0aWFsaXplKFdlYlZpZXdJbXBsKiB3ZWJWaWV3 LCBjb25zdCBTdHJpbmcmIHBsdWdpblR5cGUpCitib29sIFdlYkhlbHBlclBsdWdpbkltcGw6Omlu aXRpYWxpemUoY29uc3QgU3RyaW5nJiBwbHVnaW5UeXBlLCBXZWJGcmFtZSogaG9zdEZyYW1lLCBX ZWJWaWV3SW1wbCogd2ViVmlldykKIHsKICAgICBBU1NFUlQod2ViVmlldyk7CiAgICAgbV93ZWJW aWV3ID0gd2ViVmlldzsKIAotICAgIHJldHVybiBpbml0aWFsaXplUGFnZSh3ZWJWaWV3LCBwbHVn aW5UeXBlKTsKKyAgICByZXR1cm4gaW5pdGlhbGl6ZVBhZ2UocGx1Z2luVHlwZSwgaG9zdEZyYW1l KTsKIH0KIAogdm9pZCBXZWJIZWxwZXJQbHVnaW5JbXBsOjpjbG9zZUhlbHBlclBsdWdpbigpCkBA IC0xNzUsNyArMTgwLDcgQEAgV2ViUGx1Z2luKiBXZWJIZWxwZXJQbHVnaW5JbXBsOjpnZXRQbHVn aW4oKQogICAgIHJldHVybiBwbHVnaW47CiB9CiAKLWJvb2wgV2ViSGVscGVyUGx1Z2luSW1wbDo6 aW5pdGlhbGl6ZVBhZ2UoV2ViS2l0OjpXZWJWaWV3SW1wbCogd2ViVmlldywgY29uc3QgU3RyaW5n JiBwbHVnaW5UeXBlKQorYm9vbCBXZWJIZWxwZXJQbHVnaW5JbXBsOjppbml0aWFsaXplUGFnZShj b25zdCBTdHJpbmcmIHBsdWdpblR5cGUsIFdlYkZyYW1lKiBob3N0RnJhbWUpCiB7CiAgICAgUGFn ZTo6UGFnZUNsaWVudHMgcGFnZUNsaWVudHM7CiAgICAgZmlsbFdpdGhFbXB0eUNsaWVudHMocGFn ZUNsaWVudHMpOwpAQCAtMTkwLDcgKzE5NSw3IEBAIGJvb2wgV2ViSGVscGVyUGx1Z2luSW1wbDo6 aW5pdGlhbGl6ZVBhZ2UoV2ViS2l0OjpXZWJWaWV3SW1wbCogd2ViVmlldywgY29uc3QgU3RyCiAg ICAgdW5zaWduZWQgbGF5b3V0TWlsZXN0b25lcyA9IERpZEZpcnN0TGF5b3V0IHwgRGlkRmlyc3RW aXN1YWxseU5vbkVtcHR5TGF5b3V0OwogICAgIG1fcGFnZS0+YWRkTGF5b3V0TWlsZXN0b25lcyhz dGF0aWNfY2FzdDxMYXlvdXRNaWxlc3RvbmVzPihsYXlvdXRNaWxlc3RvbmVzKSk7CiAKLSAgICB3 ZWJWaWV3LT5jbGllbnQoKS0+aW5pdGlhbGl6ZUhlbHBlclBsdWdpbldlYkZyYW1lKHRoaXMpOwor ICAgIG1fd2ViVmlldy0+Y2xpZW50KCktPmluaXRpYWxpemVIZWxwZXJQbHVnaW5XZWJGcmFtZSh0 aGlzKTsKIAogICAgIC8vIFRoZSBwYWdlJ3MgbWFpbiBmcmFtZSB3YXMgc2V0IGluIGluaXRpYWxp emVGcmFtZSgpIGFzIGEgcmVzdWx0IG9mIHRoZSBhYm92ZSBjYWxsLgogICAgIEZyYW1lKiBmcmFt ZSA9IG1fcGFnZS0+bWFpbkZyYW1lKCk7CkBAIC0xOTksNyArMjA0LDcgQEAgYm9vbCBXZWJIZWxw ZXJQbHVnaW5JbXBsOjppbml0aWFsaXplUGFnZShXZWJLaXQ6OldlYlZpZXdJbXBsKiB3ZWJWaWV3 LCBjb25zdCBTdHIKICAgICAvLyBObyBuZWVkIHRvIHNldCBhIHNpemUgb3IgbWFrZSBpdCBub3Qg dHJhbnNwYXJlbnQuCiAKICAgICBEb2N1bWVudFdyaXRlciogd3JpdGVyID0gZnJhbWUtPmxvYWRl cigpLT5hY3RpdmVEb2N1bWVudExvYWRlcigpLT53cml0ZXIoKTsKLSAgICB3cml0ZURvY3VtZW50 KCp3cml0ZXIsIHBsdWdpblR5cGUpOworICAgIHdyaXRlRG9jdW1lbnQocGx1Z2luVHlwZSwgaG9z dEZyYW1lLCAqd3JpdGVyKTsKIAogICAgIHJldHVybiB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSGVscGVyUGx1Z2luSW1wbC5oIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViSGVscGVyUGx1Z2luSW1wbC5oCmluZGV4IGIzODMzNGNjMjI4 NDUwY2VhYTBhYjc2ZDQzMjlkZDVjNjE4ZmQwNDYuLmNhN2RlMWUwMzk1ODE0MDNmMjE3NDQ1NWQx YTlkNzUzMGVlMjM5YmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YkhlbHBlclBsdWdpbkltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJI ZWxwZXJQbHVnaW5JbXBsLmgKQEAgLTQyLDYgKzQyLDcgQEAgY2xhc3MgUGFnZTsKIG5hbWVzcGFj ZSBXZWJLaXQgewogCiBjbGFzcyBIZWxwZXJQbHVnaW5DaHJvbWVDbGllbnQ7CitjbGFzcyBXZWJG cmFtZTsKIGNsYXNzIFdlYlZpZXdJbXBsOwogY2xhc3MgV2ViV2lkZ2V0Q2xpZW50OwogCkBAIC01 NCw3ICs1NSw3IEBAIGNsYXNzIFdlYkhlbHBlclBsdWdpbkltcGwgOiBwdWJsaWMgV2ViSGVscGVy UGx1Z2luLAogCiBwdWJsaWM6CiAgICAgdmlydHVhbCB+V2ViSGVscGVyUGx1Z2luSW1wbCgpOwot ICAgIGJvb2wgaW5pdGlhbGl6ZShXZWJWaWV3SW1wbCosIGNvbnN0IFN0cmluZyYgcGx1Z2luVHlw ZSk7CisgICAgYm9vbCBpbml0aWFsaXplKGNvbnN0IFN0cmluZyYgcGx1Z2luVHlwZSwgV2ViRnJh bWUqIGhvc3RGcmFtZSwgV2ViVmlld0ltcGwqKTsKICAgICB2b2lkIGNsb3NlSGVscGVyUGx1Z2lu KCk7CiAKICAgICAvLyBXZWJIZWxwZXJQbHVnaW4gbWV0aG9kczoKQEAgLTYzLDcgKzY0LDcgQEAg cHVibGljOgogCiBwcml2YXRlOgogICAgIGV4cGxpY2l0IFdlYkhlbHBlclBsdWdpbkltcGwoV2Vi V2lkZ2V0Q2xpZW50Kik7Ci0gICAgYm9vbCBpbml0aWFsaXplUGFnZShXZWJLaXQ6OldlYlZpZXdJ bXBsKiwgY29uc3QgU3RyaW5nJiBwbHVnaW5UeXBlKTsKKyAgICBib29sIGluaXRpYWxpemVQYWdl KGNvbnN0IFN0cmluZyYgcGx1Z2luVHlwZSwgV2ViRnJhbWUqIGhvc3RGcmFtZSk7CiAgICAgdm9p ZCBkZXN0cm95UGFnZSgpOwogCiAgICAgLy8gV2ViV2lkZ2V0IG1ldGhvZHM6CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuY3Bw IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmNw cAppbmRleCBjM2RiYmMzMzQzYjViMzRhNjZmOGU3YTljNzdiODZjYmFiYzkzNzhkLi5mMmY1ODM1 MTVhNzY1NjM1YWUwNzc5YzNkYmZlZDU0YWM4NmFlMmQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5jcHAKQEAgLTQw Niw4ICs0MDYsOSBAQCB2b2lkIFdlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6a2V5TmVlZGVkKGNv bnN0IFdlYlN0cmluZyYga2V5U3lzdGVtLCBjb25zdCBXZWJTdAogV2ViUGx1Z2luKiBXZWJNZWRp YVBsYXllckNsaWVudEltcGw6OmNyZWF0ZUhlbHBlclBsdWdpbihjb25zdCBXZWJTdHJpbmcmIHBs dWdpblR5cGUsIFdlYkZyYW1lKiBmcmFtZSkKIHsKICAgICBBU1NFUlQoIW1faGVscGVyUGx1Z2lu KTsKKwogICAgIFdlYlZpZXdJbXBsKiB3ZWJWaWV3ID0gc3RhdGljX2Nhc3Q8V2ViVmlld0ltcGwq PihmcmFtZS0+dmlldygpKTsKLSAgICBtX2hlbHBlclBsdWdpbiA9IHdlYlZpZXctPmNyZWF0ZUhl bHBlclBsdWdpbihwbHVnaW5UeXBlKTsKKyAgICBtX2hlbHBlclBsdWdpbiA9IHdlYlZpZXctPmNy ZWF0ZUhlbHBlclBsdWdpbihwbHVnaW5UeXBlLCBmcmFtZSk7CiAgICAgaWYgKCFtX2hlbHBlclBs dWdpbikKICAgICAgICAgcmV0dXJuIDA7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlZpZXdJbXBsLmNwcAppbmRleCBmNjVjNTljMWI2ZDkwYzNiZGNlZTEzMTdkZWEwNWFkYTgwM2Iw NjQwLi5mMjVkZjFkZjkzOWEyODk1MTllZjY4ZDI2MzZhNjAzZjliMjZmYTRkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC0xNjQsNiArMTY0LDggQEAK ICNpbmNsdWRlIDx3dGYvVGVtcG9yYXJ5Q2hhbmdlLmg+CiAjaW5jbHVkZSA8d3RmL1VpbnQ4Q2xh bXBlZEFycmF5Lmg+CiAKKworCiAjaWYgRU5BQkxFKERFRkFVTFRfUkVOREVSX1RIRU1FKQogI2lu Y2x1ZGUgIlBsYXRmb3JtVGhlbWVDaHJvbWl1bURlZmF1bHQuaCIKICNpbmNsdWRlICJSZW5kZXJU aGVtZUNocm9taXVtRGVmYXVsdC5oIgpAQCAtMTU5MywxMyArMTU5NSwxMyBAQCB2b2lkIFdlYlZp ZXdJbXBsOjpoaWRlQXV0b2ZpbGxQb3B1cCgpCiAgICAgfQogfQogCi1XZWJIZWxwZXJQbHVnaW5J bXBsKiBXZWJWaWV3SW1wbDo6Y3JlYXRlSGVscGVyUGx1Z2luKGNvbnN0IFN0cmluZyYgcGx1Z2lu VHlwZSkKK1dlYkhlbHBlclBsdWdpbkltcGwqIFdlYlZpZXdJbXBsOjpjcmVhdGVIZWxwZXJQbHVn aW4oY29uc3QgU3RyaW5nJiBwbHVnaW5UeXBlLCBXZWJGcmFtZSogaG9zdEZyYW1lKQogewogICAg IFdlYldpZGdldCogcG9wdXBXaWRnZXQgPSBtX2NsaWVudC0+Y3JlYXRlUG9wdXBNZW51KFdlYlBv cHVwVHlwZUhlbHBlclBsdWdpbik7CiAgICAgQVNTRVJUKHBvcHVwV2lkZ2V0KTsKICAgICBXZWJI ZWxwZXJQbHVnaW5JbXBsKiBoZWxwZXJQbHVnaW4gPSBzdGF0aWNfY2FzdDxXZWJIZWxwZXJQbHVn aW5JbXBsKj4ocG9wdXBXaWRnZXQpOwogCi0gICAgaWYgKCFoZWxwZXJQbHVnaW4tPmluaXRpYWxp emUodGhpcywgcGx1Z2luVHlwZSkpIHsKKyAgICBpZiAoIWhlbHBlclBsdWdpbi0+aW5pdGlhbGl6 ZShwbHVnaW5UeXBlLCBob3N0RnJhbWUsIHRoaXMpKSB7CiAgICAgICAgIGhlbHBlclBsdWdpbi0+ Y2xvc2VIZWxwZXJQbHVnaW4oKTsKICAgICAgICAgaGVscGVyUGx1Z2luID0gMDsKICAgICB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAppbmRleCBkZTQ4ODUxYjI5MTEw MmU1NGE3YTcyNzJmZDg2NjI2NmIxNzNjZDA0Li4xN2Q4YmIwYjU1MzQ2OGI0ZTYyNDAxY2U4MGQy ODk1MDI5NTZhM2U0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJW aWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgK QEAgLTUxOSw3ICs1MTksOCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGhpZGVBdXRvZmlsbFBvcHVw KCk7CiAKLSAgICBXZWJIZWxwZXJQbHVnaW5JbXBsKiBjcmVhdGVIZWxwZXJQbHVnaW4oY29uc3Qg U3RyaW5nJiBwbHVnaW5UeXBlKTsKKyAgICAvLyBDcmVhdGVzIGEgSGVscGVyIFBsdWdpbiBvZiB8 cGx1Z2luVHlwZXwgZm9yIHxob3N0RnJhbWV8LgorICAgIFdlYkhlbHBlclBsdWdpbkltcGwqIGNy ZWF0ZUhlbHBlclBsdWdpbihjb25zdCBTdHJpbmcmIHBsdWdpblR5cGUsIFdlYkZyYW1lKiBob3N0 RnJhbWUpOwogCiAgICAgLy8gUmV0dXJucyB0aGUgaW5wdXQgZXZlbnQgd2UncmUgY3VycmVudGx5 IHByb2Nlc3NpbmcuIFRoaXMgaXMgdXNlZCBpbiBzb21lCiAgICAgLy8gY2FzZXMgd2hlcmUgdGhl IFdlYkNvcmUgRE9NIGV2ZW50IGRvZXNuJ3QgaGF2ZSB0aGUgaW5mb3JtYXRpb24gd2UgbmVlZC4K 192329 2013-03-08 20:27:27 -0800 2013-03-09 08:56:50 -0800 Patch bug-111913-20130308202330.patch text/plain 8554 ddorwin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MjIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGJmYmEwZjdkYjUwM2Y0NDIzZDA4Y2ViZmFmYzU1ODRiZmJjNjRkMDcuLmFkMzEwYjQxMDA1YTcz YjdiZTRjYmEzOGRkYTVjNjY4NmQxZjQ0OTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTMtMDMtMDggIERhdmlkIERvcndpbiAgPGRkb3J3aW5AY2hyb21p dW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gU2V0IHRoZSBIZWxwZXIgUGx1Z2luJ3MgVVJM IHRvIHRoYXQgb2YgdGhlIGhvc3QgZG9jdW1lbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE5MTMKKworICAgICAgICBUaGlzIGFsbG93cyBjb250 ZW50IHNldHRpbmdzLCBldGMuIHRvIGJlIGJhc2VkIG9uIHRoZSBkb2N1bWVudCBob3N0aW5nCisg ICAgICAgIHRoZSBlbGVtZW50IHRoYXQgcmVxdWVzdGVkIHRoZSBIZWxwZXIgUGx1Z2luLgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3JjL1dlYkhl bHBlclBsdWdpbkltcGwuY3BwOgorICAgICAgICAoV2ViS2l0Ojp3cml0ZURvY3VtZW50KToKKyAg ICAgICAgKFdlYktpdDo6V2ViSGVscGVyUGx1Z2luSW1wbDo6aW5pdGlhbGl6ZSk6CisgICAgICAg IChXZWJLaXQ6OldlYkhlbHBlclBsdWdpbkltcGw6OmluaXRpYWxpemVQYWdlKToKKyAgICAgICAg KiBzcmMvV2ViSGVscGVyUGx1Z2luSW1wbC5oOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAg KFdlYkhlbHBlclBsdWdpbkltcGwpOgorICAgICAgICAqIHNyYy9XZWJNZWRpYVBsYXllckNsaWVu dEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OmNy ZWF0ZUhlbHBlclBsdWdpbik6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmNyZWF0ZUhlbHBlclBsdWdpbik6CisgICAgICAgICog c3JjL1dlYlZpZXdJbXBsLmg6CisgICAgICAgIChXZWJWaWV3SW1wbCk6CisKIDIwMTMtMDMtMDcg IEtlaXNoaSBIYXR0b3JpICA8a2Vpc2hpQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVXBkYXRlIGNh bGVuZGFyIHBpY2tlciBVSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViSGVscGVyUGx1Z2luSW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJI ZWxwZXJQbHVnaW5JbXBsLmNwcAppbmRleCA0MDEyMWRhNDkzZGNkYjQ0OWU1OGI2MGI1ZDRiNTYw MDRhYTY5YWIyLi41ZDQzMDg3ZDQ5NDBhZjU1OGZhNGUyYjg0OGMxMmJmZmY5YTE0YjM3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJIZWxwZXJQbHVnaW5JbXBsLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJIZWxwZXJQbHVnaW5JbXBsLmNw cApAQCAtNDAsNiArNDAsNyBAQAogI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJQYWdlV2lk Z2V0RGVsZWdhdGUuaCIKICNpbmNsdWRlICJTZXR0aW5ncy5oIgorI2luY2x1ZGUgIldlYkRvY3Vt ZW50LmgiCiAjaW5jbHVkZSAiV2ViRnJhbWVJbXBsLmgiCiAjaW5jbHVkZSAiV2ViUGx1Z2luLmgi CiAjaW5jbHVkZSAiV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oIgpAQCAtNTksMTEgKzYwLDE1IEBA IHN0YXRpYyBpbmxpbmUgdm9pZCBhZGRTdHJpbmcoY29uc3QgU3RyaW5nJiBzdHIsIERvY3VtZW50 V3JpdGVyJiB3cml0ZXIpCiAgICAgd3JpdGVyLmFkZERhdGEoc3RyOC5kYXRhKCksIHN0cjgubGVu Z3RoKCkpOwogfQogCi12b2lkIHdyaXRlRG9jdW1lbnQoV2ViQ29yZTo6RG9jdW1lbnRXcml0ZXIm IHdyaXRlciwgY29uc3QgU3RyaW5nJiBwbHVnaW5UeXBlKQordm9pZCB3cml0ZURvY3VtZW50KGNv bnN0IFN0cmluZyYgcGx1Z2luVHlwZSwgY29uc3QgV2ViRG9jdW1lbnQmIGhvc3REb2N1bWVudCwg V2ViQ29yZTo6RG9jdW1lbnRXcml0ZXImIHdyaXRlcikKIHsKKyAgICAvLyBHaXZlIHRoZSBuZXcg ZG9jdW1lbnQgdGhlIHNhbWUgVVJMIGFzIHRoZSBob3NlIGRvY3VtZW50IHNvIHRoYXQgY29udGVu dAorICAgIC8vIHNldHRpbmdzIGFuZCBvdGhlciBkZWNpc2lvbnMgY2FuIGJlIG1hZGUgYmFzZWQg b24gdGhlIGNvcnJlY3Qgb3JpZ2luLgorICAgIGNvbnN0IFdlYlVSTCYgdXJsID0gaG9zdERvY3Vt ZW50LnVybCgpOworCiAgICAgd3JpdGVyLnNldE1JTUVUeXBlKCJ0ZXh0L2h0bWwiKTsKICAgICB3 cml0ZXIuc2V0RW5jb2RpbmcoIlVURi04IiwgZmFsc2UpOwotICAgIHdyaXRlci5iZWdpbigpOwor ICAgIHdyaXRlci5iZWdpbih1cmwpOwogCiAgICAgYWRkTGl0ZXJhbCgiPCFET0NUWVBFIGh0bWw+ PGhlYWQ+PG1ldGEgY2hhcnNldD0nVVRGLTgnPjwvaGVhZD48Ym9keT5cbiIsIHdyaXRlcik7CiAg ICAgU3RyaW5nIG9iamVjdFRhZyA9ICI8b2JqZWN0IHR5cGU9XCIiICsgcGx1Z2luVHlwZSArICJc Ij48L29iamVjdD4iOwpAQCAtMTE1LDEyICsxMjAsMTIgQEAgV2ViSGVscGVyUGx1Z2luSW1wbDo6 fldlYkhlbHBlclBsdWdpbkltcGwoKQogICAgIEFTU0VSVCghbV9wYWdlKTsKIH0KIAotYm9vbCBX ZWJIZWxwZXJQbHVnaW5JbXBsOjppbml0aWFsaXplKFdlYlZpZXdJbXBsKiB3ZWJWaWV3LCBjb25z dCBTdHJpbmcmIHBsdWdpblR5cGUpCitib29sIFdlYkhlbHBlclBsdWdpbkltcGw6OmluaXRpYWxp emUoY29uc3QgU3RyaW5nJiBwbHVnaW5UeXBlLCBjb25zdCBXZWJEb2N1bWVudCYgaG9zdERvY3Vt ZW50LCBXZWJWaWV3SW1wbCogd2ViVmlldykKIHsKICAgICBBU1NFUlQod2ViVmlldyk7CiAgICAg bV93ZWJWaWV3ID0gd2ViVmlldzsKIAotICAgIHJldHVybiBpbml0aWFsaXplUGFnZSh3ZWJWaWV3 LCBwbHVnaW5UeXBlKTsKKyAgICByZXR1cm4gaW5pdGlhbGl6ZVBhZ2UocGx1Z2luVHlwZSwgaG9z dERvY3VtZW50KTsKIH0KIAogdm9pZCBXZWJIZWxwZXJQbHVnaW5JbXBsOjpjbG9zZUhlbHBlclBs dWdpbigpCkBAIC0xNzUsNyArMTgwLDcgQEAgV2ViUGx1Z2luKiBXZWJIZWxwZXJQbHVnaW5JbXBs OjpnZXRQbHVnaW4oKQogICAgIHJldHVybiBwbHVnaW47CiB9CiAKLWJvb2wgV2ViSGVscGVyUGx1 Z2luSW1wbDo6aW5pdGlhbGl6ZVBhZ2UoV2ViS2l0OjpXZWJWaWV3SW1wbCogd2ViVmlldywgY29u c3QgU3RyaW5nJiBwbHVnaW5UeXBlKQorYm9vbCBXZWJIZWxwZXJQbHVnaW5JbXBsOjppbml0aWFs aXplUGFnZShjb25zdCBTdHJpbmcmIHBsdWdpblR5cGUsIGNvbnN0IFdlYkRvY3VtZW50JiBob3N0 RG9jdW1lbnQpCiB7CiAgICAgUGFnZTo6UGFnZUNsaWVudHMgcGFnZUNsaWVudHM7CiAgICAgZmls bFdpdGhFbXB0eUNsaWVudHMocGFnZUNsaWVudHMpOwpAQCAtMTkwLDcgKzE5NSw3IEBAIGJvb2wg V2ViSGVscGVyUGx1Z2luSW1wbDo6aW5pdGlhbGl6ZVBhZ2UoV2ViS2l0OjpXZWJWaWV3SW1wbCog d2ViVmlldywgY29uc3QgU3RyCiAgICAgdW5zaWduZWQgbGF5b3V0TWlsZXN0b25lcyA9IERpZEZp cnN0TGF5b3V0IHwgRGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0OwogICAgIG1fcGFnZS0+ YWRkTGF5b3V0TWlsZXN0b25lcyhzdGF0aWNfY2FzdDxMYXlvdXRNaWxlc3RvbmVzPihsYXlvdXRN aWxlc3RvbmVzKSk7CiAKLSAgICB3ZWJWaWV3LT5jbGllbnQoKS0+aW5pdGlhbGl6ZUhlbHBlclBs dWdpbldlYkZyYW1lKHRoaXMpOworICAgIG1fd2ViVmlldy0+Y2xpZW50KCktPmluaXRpYWxpemVI ZWxwZXJQbHVnaW5XZWJGcmFtZSh0aGlzKTsKIAogICAgIC8vIFRoZSBwYWdlJ3MgbWFpbiBmcmFt ZSB3YXMgc2V0IGluIGluaXRpYWxpemVGcmFtZSgpIGFzIGEgcmVzdWx0IG9mIHRoZSBhYm92ZSBj YWxsLgogICAgIEZyYW1lKiBmcmFtZSA9IG1fcGFnZS0+bWFpbkZyYW1lKCk7CkBAIC0xOTksNyAr MjA0LDcgQEAgYm9vbCBXZWJIZWxwZXJQbHVnaW5JbXBsOjppbml0aWFsaXplUGFnZShXZWJLaXQ6 OldlYlZpZXdJbXBsKiB3ZWJWaWV3LCBjb25zdCBTdHIKICAgICAvLyBObyBuZWVkIHRvIHNldCBh IHNpemUgb3IgbWFrZSBpdCBub3QgdHJhbnNwYXJlbnQuCiAKICAgICBEb2N1bWVudFdyaXRlciog d3JpdGVyID0gZnJhbWUtPmxvYWRlcigpLT5hY3RpdmVEb2N1bWVudExvYWRlcigpLT53cml0ZXIo KTsKLSAgICB3cml0ZURvY3VtZW50KCp3cml0ZXIsIHBsdWdpblR5cGUpOworICAgIHdyaXRlRG9j dW1lbnQocGx1Z2luVHlwZSwgaG9zdERvY3VtZW50LCAqd3JpdGVyKTsKIAogICAgIHJldHVybiB0 cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSGVscGVy UGx1Z2luSW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSGVscGVyUGx1Z2lu SW1wbC5oCmluZGV4IGIzODMzNGNjMjI4NDUwY2VhYTBhYjc2ZDQzMjlkZDVjNjE4ZmQwNDYuLjkw YmZjNThkOThlYTAwZjAxZGRmMDQ2M2I1MGEyZmFhZTc3ZjJhMTMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkhlbHBlclBsdWdpbkltcGwuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJIZWxwZXJQbHVnaW5JbXBsLmgKQEAgLTQyLDYgKzQyLDgg QEAgY2xhc3MgUGFnZTsKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBIZWxwZXJQbHVnaW5D aHJvbWVDbGllbnQ7CitjbGFzcyBXZWJEb2N1bWVudDsKK2NsYXNzIFdlYkZyYW1lOwogY2xhc3Mg V2ViVmlld0ltcGw7CiBjbGFzcyBXZWJXaWRnZXRDbGllbnQ7CiAKQEAgLTU0LDcgKzU2LDcgQEAg Y2xhc3MgV2ViSGVscGVyUGx1Z2luSW1wbCA6IHB1YmxpYyBXZWJIZWxwZXJQbHVnaW4sCiAKIHB1 YmxpYzoKICAgICB2aXJ0dWFsIH5XZWJIZWxwZXJQbHVnaW5JbXBsKCk7Ci0gICAgYm9vbCBpbml0 aWFsaXplKFdlYlZpZXdJbXBsKiwgY29uc3QgU3RyaW5nJiBwbHVnaW5UeXBlKTsKKyAgICBib29s IGluaXRpYWxpemUoY29uc3QgU3RyaW5nJiBwbHVnaW5UeXBlLCBjb25zdCBXZWJEb2N1bWVudCYg aG9zdERvY3VtZW50LCBXZWJWaWV3SW1wbCopOwogICAgIHZvaWQgY2xvc2VIZWxwZXJQbHVnaW4o KTsKIAogICAgIC8vIFdlYkhlbHBlclBsdWdpbiBtZXRob2RzOgpAQCAtNjMsNyArNjUsNyBAQCBw dWJsaWM6CiAKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgV2ViSGVscGVyUGx1Z2luSW1wbChXZWJX aWRnZXRDbGllbnQqKTsKLSAgICBib29sIGluaXRpYWxpemVQYWdlKFdlYktpdDo6V2ViVmlld0lt cGwqLCBjb25zdCBTdHJpbmcmIHBsdWdpblR5cGUpOworICAgIGJvb2wgaW5pdGlhbGl6ZVBhZ2Uo Y29uc3QgU3RyaW5nJiBwbHVnaW5UeXBlLCBjb25zdCBXZWJEb2N1bWVudCYgaG9zdERvY3VtZW50 KTsKICAgICB2b2lkIGRlc3Ryb3lQYWdlKCk7CiAKICAgICAvLyBXZWJXaWRnZXQgbWV0aG9kczoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xp ZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNs aWVudEltcGwuY3BwCmluZGV4IGMzZGJiYzMzNDNiNWIzNGE2NmY4ZTdhOWM3N2I4NmNiYWJjOTM3 OGQuLmUyMGZkYTMwODZmNjJmYTNmZmI4OWIwYmQzZTM4OTAxZmJlZTBmMzIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5jcHAK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBs LmNwcApAQCAtMjMsNiArMjMsNyBAQAogI2luY2x1ZGUgIlRpbWVSYW5nZXMuaCIKICNpbmNsdWRl ICJVVUlELmgiCiAjaW5jbHVkZSAiV2ViQXVkaW9Tb3VyY2VQcm92aWRlci5oIgorI2luY2x1ZGUg IldlYkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiV2ViRnJhbWVDbGllbnQuaCIKICNpbmNsdWRlICJX ZWJGcmFtZUltcGwuaCIKICNpbmNsdWRlICJXZWJIZWxwZXJQbHVnaW5JbXBsLmgiCkBAIC00MDYs OCArNDA3LDkgQEAgdm9pZCBXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OmtleU5lZWRlZChjb25z dCBXZWJTdHJpbmcmIGtleVN5c3RlbSwgY29uc3QgV2ViU3QKIFdlYlBsdWdpbiogV2ViTWVkaWFQ bGF5ZXJDbGllbnRJbXBsOjpjcmVhdGVIZWxwZXJQbHVnaW4oY29uc3QgV2ViU3RyaW5nJiBwbHVn aW5UeXBlLCBXZWJGcmFtZSogZnJhbWUpCiB7CiAgICAgQVNTRVJUKCFtX2hlbHBlclBsdWdpbik7 CisKICAgICBXZWJWaWV3SW1wbCogd2ViVmlldyA9IHN0YXRpY19jYXN0PFdlYlZpZXdJbXBsKj4o ZnJhbWUtPnZpZXcoKSk7Ci0gICAgbV9oZWxwZXJQbHVnaW4gPSB3ZWJWaWV3LT5jcmVhdGVIZWxw ZXJQbHVnaW4ocGx1Z2luVHlwZSk7CisgICAgbV9oZWxwZXJQbHVnaW4gPSB3ZWJWaWV3LT5jcmVh dGVIZWxwZXJQbHVnaW4ocGx1Z2luVHlwZSwgZnJhbWUtPmRvY3VtZW50KCkpOwogICAgIGlmICgh bV9oZWxwZXJQbHVnaW4pCiAgICAgICAgIHJldHVybiAwOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggZjY1YzU5YzFiNmQ5MGMzYmRjZWUxMzE3ZGVh MDVhZGE4MDNiMDY0MC4uZTIzZDNjYzg1YjY3OGU0NGY0ODNjODI4NGY5NjE4MDYxMDA2ZTg4ZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtMTU5Mywx MyArMTU5MywxMyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpoaWRlQXV0b2ZpbGxQb3B1cCgpCiAgICAg fQogfQogCi1XZWJIZWxwZXJQbHVnaW5JbXBsKiBXZWJWaWV3SW1wbDo6Y3JlYXRlSGVscGVyUGx1 Z2luKGNvbnN0IFN0cmluZyYgcGx1Z2luVHlwZSkKK1dlYkhlbHBlclBsdWdpbkltcGwqIFdlYlZp ZXdJbXBsOjpjcmVhdGVIZWxwZXJQbHVnaW4oY29uc3QgU3RyaW5nJiBwbHVnaW5UeXBlLCBjb25z dCBXZWJEb2N1bWVudCYgaG9zdERvY3VtZW50KQogewogICAgIFdlYldpZGdldCogcG9wdXBXaWRn ZXQgPSBtX2NsaWVudC0+Y3JlYXRlUG9wdXBNZW51KFdlYlBvcHVwVHlwZUhlbHBlclBsdWdpbik7 CiAgICAgQVNTRVJUKHBvcHVwV2lkZ2V0KTsKICAgICBXZWJIZWxwZXJQbHVnaW5JbXBsKiBoZWxw ZXJQbHVnaW4gPSBzdGF0aWNfY2FzdDxXZWJIZWxwZXJQbHVnaW5JbXBsKj4ocG9wdXBXaWRnZXQp OwogCi0gICAgaWYgKCFoZWxwZXJQbHVnaW4tPmluaXRpYWxpemUodGhpcywgcGx1Z2luVHlwZSkp IHsKKyAgICBpZiAoIWhlbHBlclBsdWdpbi0+aW5pdGlhbGl6ZShwbHVnaW5UeXBlLCBob3N0RG9j dW1lbnQsIHRoaXMpKSB7CiAgICAgICAgIGhlbHBlclBsdWdpbi0+Y2xvc2VIZWxwZXJQbHVnaW4o KTsKICAgICAgICAgaGVscGVyUGx1Z2luID0gMDsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViVmlld0ltcGwuaAppbmRleCBkZTQ4ODUxYjI5MTEwMmU1NGE3YTcyNzJmZDg2NjI2 NmIxNzNjZDA0Li41YWQ1MjE3ZjQ3MjEwYjJhNzA0NGY3MDU5YzYzM2IwOGQ5NmVmZDdlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAgLTEwNSw2ICsxMDUsNyBA QCBjbGFzcyBXZWJBY3RpdmVHZXN0dXJlQW5pbWF0aW9uOwogY2xhc3MgV2ViQ29tcG9zaXRvcklt cGw7CiBjbGFzcyBXZWJEZXZUb29sc0FnZW50Q2xpZW50OwogY2xhc3MgV2ViRGV2VG9vbHNBZ2Vu dFByaXZhdGU7CitjbGFzcyBXZWJEb2N1bWVudDsKIGNsYXNzIFdlYkZyYW1lSW1wbDsKIGNsYXNz IFdlYkdlc3R1cmVFdmVudDsKIGNsYXNzIFdlYkhlbHBlclBsdWdpbkltcGw7CkBAIC01MTksNyAr NTIwLDggQEAgcHVibGljOgogCiAgICAgdm9pZCBoaWRlQXV0b2ZpbGxQb3B1cCgpOwogCi0gICAg V2ViSGVscGVyUGx1Z2luSW1wbCogY3JlYXRlSGVscGVyUGx1Z2luKGNvbnN0IFN0cmluZyYgcGx1 Z2luVHlwZSk7CisgICAgLy8gQ3JlYXRlcyBhIEhlbHBlciBQbHVnaW4gb2YgfHBsdWdpblR5cGV8 IGZvciB8aG9zdERvY3VtZW50fC4KKyAgICBXZWJIZWxwZXJQbHVnaW5JbXBsKiBjcmVhdGVIZWxw ZXJQbHVnaW4oY29uc3QgU3RyaW5nJiBwbHVnaW5UeXBlLCBjb25zdCBXZWJEb2N1bWVudCYgaG9z dERvY3VtZW50KTsKIAogICAgIC8vIFJldHVybnMgdGhlIGlucHV0IGV2ZW50IHdlJ3JlIGN1cnJl bnRseSBwcm9jZXNzaW5nLiBUaGlzIGlzIHVzZWQgaW4gc29tZQogICAgIC8vIGNhc2VzIHdoZXJl IHRoZSBXZWJDb3JlIERPTSBldmVudCBkb2Vzbid0IGhhdmUgdGhlIGluZm9ybWF0aW9uIHdlIG5l ZWQuCg==