37769 2010-04-18 02:15:10 -0700 [Gtk] Flash item placed on wrong location right after load 2011-02-23 15:07:41 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC Linux RESOLVED FIXED http://www.demorgen.be Gtk P2 Normal --- 0 fhimpe webkit-unassigned mrobinson nicolas xan.lopez oldest_to_newest 213730 0 fhimpe 2010-04-18 02:15:10 -0700 Visit http://www.demorgen using Epiphany or Midori with webkitgtk 1.2.0. After load, a Flash item will be placed on top of the page. when scrolling, the element is moved to the correct place neare the bottom of the page. It should have been on this location automatically from the beginning. 213731 1 fhimpe 2010-04-18 02:15:52 -0700 URL should be http://www.demorgen.be 320293 2 nicolas 2010-12-10 11:56:23 -0800 So far on current trunk I get an assertion (ASSERTION FAILED: m_state == ParsingState). Might be related, I'll comment it out, so see how far I'll get. 320309 3 nicolas 2010-12-10 12:11:24 -0800 I've commented that assertion and bug cannot be reproduced on latest trunk. Will file another bug for this assertion with proper information. 356337 4 mrobinson 2011-02-23 12:56:23 -0800 The issue here seems to be http://trac.webkit.org/changeset/55238. Flash content is somehow getting an incorrect allocation when the plugin is added. Possibly the frameRect and the m_windowRect have diverged at this point. Here is a page that reproduces the original Java issue: http://download.oracle.com/javase/tutorial/deployment/applet/getStarted.html Removing the work around results in the Java applet not rendering until a scroll, focus change or resize. 356378 5 83539 mrobinson 2011-02-23 13:42:15 -0800 Created attachment 83539 Patch 356394 6 83539 xan.lopez 2011-02-23 13:57:20 -0800 Comment on attachment 83539 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83539&action=review Since the patch seems to clearly improve some broken cases I guess we can go for it, but honestly we should either improve our tests or stop messing with this code. > Source/WebCore/plugins/gtk/PluginViewGtk.cpp:534 > + *(m_delayedAllocation.get()) = allocation; Can't we just store a 'GtkAllocation' in the struct and copy the values? Seems more straightforward. 356421 7 83551 mrobinson 2011-02-23 14:22:56 -0800 Created attachment 83551 Patch with a manual-test 356423 8 mrobinson 2011-02-23 14:23:27 -0800 I've managed to make a manual-test for this issue. It seems that it only appears when the Flash content is in an iframe. Uploaded a new patch. 356428 9 83551 xan.lopez 2011-02-23 14:31:11 -0800 Comment on attachment 83551 Patch with a manual-test View in context: https://bugs.webkit.org/attachment.cgi?id=83551&action=review Thank you for making a test! > Source/WebCore/plugins/gtk/PluginViewGtk.cpp:534 > + *(m_delayedAllocation.get()) = allocation; g_memdup? 356459 10 mrobinson 2011-02-23 15:07:16 -0800 Committed r79495: <http://trac.webkit.org/changeset/79495> 356461 11 83551 mrobinson 2011-02-23 15:07:41 -0800 Comment on attachment 83551 Patch with a manual-test Thanks for the review! Landed with the g_memdup change. 83539 2011-02-23 13:42:15 -0800 2011-02-23 14:22:54 -0800 Patch bug-37769-20110223134216.patch text/plain 6737 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogNzk0ODIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhYzBiYWViMWZlMDMwNzRm OTdmOWQ2M2FhZWM2NjJhYTI5NjU3OWJiLi5kOThkMTc5NzA1ODBlMTcwMTNmZDk1ZGE1NDkzMWEx ZWY4MmViZmQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDItMjMgIE1hcnRp biBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHdGtdIEZsYXNoIGl0ZW0gcGxhY2VkIG9uIHdy b25nIGxvY2F0aW9uIHJpZ2h0IGFmdGVyIGxvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTM3NzY5CisKKyAgICAgICAgSWYgYSBwbHVnaW4gaXMgR3Rr U29ja2V0IGJhc2VkLCBkbyBub3Qgc2V0IHRoZSB3aWRnZXQgYWxsb2NhdGlvbiB1bnRpbCB0aGUK KyAgICAgICAgd2luZG93IGlzIGFjdHVhbGx5IGVtYmVkZGVkIGluIHRoZSBwYXJlbnQuIFdoZW4g dGhlIHdpbmRvdyBpcyBlbWJlZGRlZCwgdXNlCisgICAgICAgIGFueSBwZW5kaW5nIGFsbG9jYXRp b24gZm9yIHRoZSBjYWxsIHRvIGd0a193aWRnZXRfc2l6ZV9hbGxvY2F0ZS4KKworICAgICAgICBO byBuZXcgdGVzdHMuIFRoaXMgYnVnIHNlZW1zIHRvIGJlIHZlcnkgdGltaW5nIGRlcGVuZGVudCwg YW5kIG9ubHkKKyAgICAgICAgYXBwZWFycyB3aGVuIGxvYWRpbmcgY2VydGFpbiBGbGFzaCBtb3Zp ZXMgb24gY2VydGFpbiBwYWdlcy4KKworICAgICAgICAqIHBsdWdpbnMvUGx1Z2luVmlldy5oOiBB ZGQgYSBmZXcgbmV3IG1lbWJlcnMgdG8gdHJhY2sgd2luZG93IGVtYmVkZGluZyBzdGF0ZS4KKyAg ICAgICAgKiBwbHVnaW5zL2d0ay9QbHVnaW5WaWV3R3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlBsdWdpblZpZXc6OnNldE5QV2luZG93SWZOZWVkZWQpOiBJZiB0aGlzIGlzIGEgR3RrU29ja2V0 LWJhc2VkIHBsdWdpbgorICAgICAgICB3YWl0IHVudGlsIHRoZSBwbHVnLWFkZGVkIHNpZ25hbCBm aXJlcyB0byBzZXQgdGhlIHdpZGdldCBhbGxvY2F0aW9uLgorICAgICAgICAoV2ViQ29yZTo6UGx1 Z2luVmlldzo6cGx1Z0FkZGVkQ2FsbGJhY2spOiBVcGRhdGVkIHRvIGJlIGEgc3RhdGljIG1ldGhv ZCwgc28gdGhhdAorICAgICAgICB3ZSBjYW4gYWNjZXNzIHByaXZhdGUgbWVtYmVycy4gSWYgdGhl cmUgaXMgYSBwZW5kaW5nIGFsbG9jYXRpb24sIGNhbGwgZ3RrX3dpZGdldF9zaXplX2FsbG9jYXRl CisgICAgICAgIHdpdGggaXQuCisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpwbGF0Zm9y bVN0YXJ0KTogVXBkYXRlIHRoZSBwbHVnaW4gc3RhdGUsIHNvIHRoYXQgd2UgZG8gbm90CisgICAg ICAgIGNhbGwgZ3RrX3dpZGdldF9zaXplX2FsbG9jYXRlIGlmIHRoZSB3aW5kb3cgaXNuJ3QgZW1i ZWRkZWQuCisKIDIwMTEtMDItMjMgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbHVnaW5zL1BsdWdpblZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmll dy5oCmluZGV4IDhmOGYxM2Y2NTlmNWI0MzYzOWM5ZTQyNDM4YjNiN2NhNTYxZTYyYjQuLmRhZTYy NmUwODAxMDY3YjM1Mzc3YzJjOWMwYjFmMWIwMWQ4NTZmOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMv UGx1Z2luVmlldy5oCkBAIC02NCw2ICs2NCwxMSBAQCBRVF9CRUdJTl9OQU1FU1BBQ0UKIGNsYXNz IFFQYWludGVyOwogUVRfRU5EX05BTUVTUEFDRQogI2VuZGlmCisjaWYgUExBVEZPUk0oR1RLKQor I2luY2x1ZGUgIkdPd25QdHJHdGsuaCIKK3R5cGVkZWYgc3RydWN0IF9HdGtTb2NrZXQgR3RrU29j a2V0OwordHlwZWRlZiBzdHJ1Y3QgX0dka1JlY3RhbmdsZSBHdGtBbGxvY2F0aW9uOworI2VuZGlm CiAKICNpZiBVU0UoSlNDKQogbmFtZXNwYWNlIEpTQyB7CkBAIC00MzIsNiArNDM3LDEzIEBAIHBy aXZhdGU6CiAjZW5kaWYKICNlbmRpZiAvLyBQTEFURk9STShRVCkKIAorI2lmIFBMQVRGT1JNKEdU SykKKyAgICAgICAgc3RhdGljIGdib29sZWFuIHBsdWdSZW1vdmVkQ2FsbGJhY2soR3RrU29ja2V0 KiwgUGx1Z2luVmlldyopOworICAgICAgICBzdGF0aWMgdm9pZCBwbHVnQWRkZWRDYWxsYmFjayhH dGtTb2NrZXQqLCBQbHVnaW5WaWV3Kik7CisgICAgICAgIGJvb2wgbV9wbHVnQWRkZWQ7CisgICAg ICAgIEdPd25QdHI8R3RrQWxsb2NhdGlvbj4gbV9kZWxheWVkQWxsb2NhdGlvbjsKKyNlbmRpZgor CiAgICAgICAgIEludFJlY3QgbV9jbGlwUmVjdDsgLy8gVGhlIGNsaXAgcmVjdCB0byBhcHBseSB0 byBhIHdpbmRvd2VkIHBsdWctaW4KICAgICAgICAgSW50UmVjdCBtX3dpbmRvd1JlY3Q7IC8vIE91 ciB3aW5kb3cgcmVjdC4KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsv UGx1Z2luVmlld0d0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL2d0ay9QbHVnaW5WaWV3 R3RrLmNwcAppbmRleCBlYzg1NWEyNDc3MmY0Mjc3MjdiYjFmNTY1YjYwNTQxNTY5YWFlNjY1Li5j ZWVjYWQzMmYwNzQ4NThiY2NiMDlhNzJjMzQ0M2QyYTcwNDA2MWNhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbHVnaW5zL2d0ay9QbHVnaW5WaWV3R3RrLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbHVnaW5zL2d0ay9QbHVnaW5WaWV3R3RrLmNwcApAQCAtNTEzLDE2ICs1MTMsMjggQEAg dm9pZCBQbHVnaW5WaWV3OjpzZXROUFdpbmRvd0lmTmVlZGVkKCkKICAgICBzZXRDYWxsaW5nUGx1 Z2luKGZhbHNlKTsKICAgICBQbHVnaW5WaWV3OjpzZXRDdXJyZW50UGx1Z2luVmlldygwKTsKIAot ICAgIGlmIChtX2lzV2luZG93ZWQpIHsKLSAgICAgICAgR3RrQWxsb2NhdGlvbiBhbGxvY2F0aW9u ID0geyBtX3dpbmRvd1JlY3QueCgpLCBtX3dpbmRvd1JlY3QueSgpLCBtX3dpbmRvd1JlY3Qud2lk dGgoKSwgbV93aW5kb3dSZWN0LmhlaWdodCgpIH07Ci0gICAgICAgIGd0a193aWRnZXRfc2l6ZV9h bGxvY2F0ZShwbGF0Zm9ybVBsdWdpbldpZGdldCgpLCAmYWxsb2NhdGlvbik7CisgICAgaWYgKCFt X2lzV2luZG93ZWQpCisgICAgICAgIHJldHVybjsKKwogI2lmIGRlZmluZWQoWFBfVU5JWCkKLSAg ICAgICAgaWYgKCFtX25lZWRzWEVtYmVkKSB7Ci0gICAgICAgICAgICBndGtfeHRiaW5fc2V0X3Bv c2l0aW9uKEdUS19YVEJJTihwbGF0Zm9ybVBsdWdpbldpZGdldCgpKSwgbV93aW5kb3dSZWN0Lngo KSwgbV93aW5kb3dSZWN0LnkoKSk7Ci0gICAgICAgICAgICBndGtfeHRiaW5fcmVzaXplKHBsYXRm b3JtUGx1Z2luV2lkZ2V0KCksIG1fd2luZG93UmVjdC53aWR0aCgpLCBtX3dpbmRvd1JlY3QuaGVp Z2h0KCkpOwotICAgICAgICB9CisgICAgLy8gR3RrWHRCaW4gd2lsbCBjYWxsIGd0a193aWRnZXRf c2l6ZV9hbGxvY2F0ZSwgc28gd2UgZG9uJ3QgbmVlZCB0byBkbyBpdCBoZXJlLgorICAgIGlmICgh bV9uZWVkc1hFbWJlZCkgeworICAgICAgICBndGtfeHRiaW5fc2V0X3Bvc2l0aW9uKEdUS19YVEJJ TihwbGF0Zm9ybVBsdWdpbldpZGdldCgpKSwgbV93aW5kb3dSZWN0LngoKSwgbV93aW5kb3dSZWN0 LnkoKSk7CisgICAgICAgIGd0a194dGJpbl9yZXNpemUocGxhdGZvcm1QbHVnaW5XaWRnZXQoKSwg bV93aW5kb3dSZWN0LndpZHRoKCksIG1fd2luZG93UmVjdC5oZWlnaHQoKSk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CiAjZW5kaWYKKworICAgIEd0a0FsbG9jYXRpb24gYWxsb2NhdGlvbiA9IHsg bV93aW5kb3dSZWN0LngoKSwgbV93aW5kb3dSZWN0LnkoKSwgbV93aW5kb3dSZWN0LndpZHRoKCks IG1fd2luZG93UmVjdC5oZWlnaHQoKSB9OworCisgICAgLy8gSWYgdGhlIHdpbmRvdyBoYXMgbm90 IGJlZW4gZW1iZWRkZWQgeWV0ICh0aGUgcGx1ZyBhZGRlZCksIHdlIGRlbGF5IHNldHRpbmcgaXRz IGFsbG9jYXRpb24gdW50aWwgCisgICAgLy8gdGhhdCBwb2ludC4gVGhpcyBmaXhlcyBpc3N1ZXMg d2l0aCBzb21lIEphdmEgcGx1Z2luIGluc3RhbmNlcyBub3QgcmVuZGVyaW5nIGltbWVkaWF0ZWx5 LgorICAgIGlmICghbV9wbHVnQWRkZWQpIHsKKyAgICAgICAgbV9kZWxheWVkQWxsb2NhdGlvbi5z ZXQoc3RhdGljX2Nhc3Q8R3RrQWxsb2NhdGlvbio+KGdfbWFsbG9jKHNpemVvZihHdGtBbGxvY2F0 aW9uKSkpKTsKKyAgICAgICAgKihtX2RlbGF5ZWRBbGxvY2F0aW9uLmdldCgpKSA9IGFsbG9jYXRp b247CisgICAgICAgIHJldHVybjsKICAgICB9CisgICAgZ3RrX3dpZGdldF9zaXplX2FsbG9jYXRl KHBsYXRmb3JtUGx1Z2luV2lkZ2V0KCksICZhbGxvY2F0aW9uKTsKIH0KIAogdm9pZCBQbHVnaW5W aWV3OjpzZXRQYXJlbnRWaXNpYmxlKGJvb2wgdmlzaWJsZSkKQEAgLTc0MywyNSArNzU1LDIyIEBA IHN0YXRpYyB2b2lkIGdldFZpc3VhbEFuZENvbG9ybWFwKGludCBkZXB0aCwgVmlzdWFsKiogdmlz dWFsLCBDb2xvcm1hcCogY29sb3JtYXApCiB9CiAjZW5kaWYKIAotc3RhdGljIGdib29sZWFuIHBs dWdSZW1vdmVkQ2FsbGJhY2soR3RrU29ja2V0KiBzb2NrZXQsIGdwb2ludGVyKQorZ2Jvb2xlYW4g UGx1Z2luVmlldzo6cGx1Z1JlbW92ZWRDYWxsYmFjayhHdGtTb2NrZXQqIHNvY2tldCwgUGx1Z2lu VmlldyogdmlldykKIHsKKyAgICB2aWV3LT5tX3BsdWdBZGRlZCA9IGZhbHNlOwogICAgIHJldHVy biBUUlVFOwogfQogCi1zdGF0aWMgdm9pZCBwbHVnQWRkZWRDYWxsYmFjayhHdGtTb2NrZXQqIHNv Y2tldCwgUGx1Z2luVmlldyogdmlldykKK3ZvaWQgUGx1Z2luVmlldzo6cGx1Z0FkZGVkQ2FsbGJh Y2soR3RrU29ja2V0KiBzb2NrZXQsIFBsdWdpblZpZXcqIHZpZXcpCiB7Ci0gICAgaWYgKCFzb2Nr ZXQgfHwgIXZpZXcpCi0gICAgICAgIHJldHVybjsKKyAgICBBU1NFUlQoc29ja2V0KTsKKyAgICBB U1NFUlQodmlldyk7CiAKLSAgICAvLyBGSVhNRTogSmF2YSBQbHVnaW5zIGRvIG5vdCBzZWVtIHRv IGRyYXcgdGhlbXNlbHZlcyBwcm9wZXJseSB0aGUKLSAgICAvLyBmaXJzdCB0aW1lIHVubGVzcyB3 ZSBkbyBhIHNpemUtYWxsb2NhdGUgYWZ0ZXIgdGhleSBoYXZlIGRvbmUKLSAgICAvLyB0aGUgcGx1 ZyBvcGVyYXRpb24gb24gdGhlaXIgc2lkZSwgd2hpY2ggaW4gZ2VuZXJhbCBkb2VzIG5vdAotICAg IC8vIGhhcHBlbiBzaW5jZSB3ZSBkbyBzaXplLWFsbG9jYXRlcyBiZWZvcmUgc2V0dGluZyB0aGUK LSAgICAvLyBOUFdpbmRvdy4gQXBwbHkgdGhpcyB3b3JrYXJvdW5kIHVudGlsIHdlIGZpZ3VyZSBv dXQgYSBiZXR0ZXIKLSAgICAvLyBzb2x1dGlvbiwgaWYgYW55LgotICAgIEludFJlY3QgcmVjdCA9 IHZpZXctPmZyYW1lUmVjdCgpOwotICAgIEd0a0FsbG9jYXRpb24gYWxsb2NhdGlvbiA9IHsgcmVj dC54KCksIHJlY3QueSgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkgfTsKLSAgICBndGtf d2lkZ2V0X3NpemVfYWxsb2NhdGUoR1RLX1dJREdFVChzb2NrZXQpLCAmYWxsb2NhdGlvbik7Cisg ICAgdmlldy0+bV9wbHVnQWRkZWQgPSB0cnVlOworICAgIGlmICh2aWV3LT5tX2RlbGF5ZWRBbGxv Y2F0aW9uKSB7CisgICAgICAgIGd0a193aWRnZXRfc2l6ZV9hbGxvY2F0ZShHVEtfV0lER0VUKHNv Y2tldCksIHZpZXctPm1fZGVsYXllZEFsbG9jYXRpb24uZ2V0KCkpOworICAgICAgICB2aWV3LT5t X2RlbGF5ZWRBbGxvY2F0aW9uLmNsZWFyKCk7CisgICAgfQogfQogCiBib29sIFBsdWdpblZpZXc6 OnBsYXRmb3JtU3RhcnQoKQpAQCAtNzkwLDEwICs3OTksMTEgQEAgYm9vbCBQbHVnaW5WaWV3Ojpw bGF0Zm9ybVN0YXJ0KCkKICAgICAgICAgICAgIGlmICghZ3RrX3dpZGdldF9nZXRfcGFyZW50KHBh Z2VDbGllbnQpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgICAgICAgICAg bV9wbHVnQWRkZWQgPSBmYWxzZTsKICAgICAgICAgICAgIHNldFBsYXRmb3JtV2lkZ2V0KGd0a19z b2NrZXRfbmV3KCkpOwogICAgICAgICAgICAgZ3RrX2NvbnRhaW5lcl9hZGQoR1RLX0NPTlRBSU5F UihwYWdlQ2xpZW50KSwgcGxhdGZvcm1QbHVnaW5XaWRnZXQoKSk7Ci0gICAgICAgICAgICBnX3Np Z25hbF9jb25uZWN0KHBsYXRmb3JtUGx1Z2luV2lkZ2V0KCksICJwbHVnLWFkZGVkIiwgR19DQUxM QkFDSyhwbHVnQWRkZWRDYWxsYmFjayksIHRoaXMpOwotICAgICAgICAgICAgZ19zaWduYWxfY29u bmVjdChwbGF0Zm9ybVBsdWdpbldpZGdldCgpLCAicGx1Zy1yZW1vdmVkIiwgR19DQUxMQkFDSyhw bHVnUmVtb3ZlZENhbGxiYWNrKSwgTlVMTCk7CisgICAgICAgICAgICBnX3NpZ25hbF9jb25uZWN0 KHBsYXRmb3JtUGx1Z2luV2lkZ2V0KCksICJwbHVnLWFkZGVkIiwgR19DQUxMQkFDSyhQbHVnaW5W aWV3OjpwbHVnQWRkZWRDYWxsYmFjayksIHRoaXMpOworICAgICAgICAgICAgZ19zaWduYWxfY29u bmVjdChwbGF0Zm9ybVBsdWdpbldpZGdldCgpLCAicGx1Zy1yZW1vdmVkIiwgR19DQUxMQkFDSyhQ bHVnaW5WaWV3OjpwbHVnUmVtb3ZlZENhbGxiYWNrKSwgdGhpcyk7CiAgICAgICAgIH0gZWxzZQog ICAgICAgICAgICAgc2V0UGxhdGZvcm1XaWRnZXQoZ3RrX3h0YmluX25ldyhwYWdlQ2xpZW50LCAw KSk7CiAjZWxzZQo= 83551 2011-02-23 14:22:56 -0800 2011-02-23 15:07:41 -0800 Patch with a manual-test bug-37769-20110223142258.patch text/plain 7947 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogNzk0ODgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4OWFhMmU4MTk5M2ZmYTBi NzMyYmQ1ZTJlZDU1MGU5OGUzYmEzN2E2Li44ZDgwMzAyMjY2NDUxNGQ3ZDdjMzIzZDU0ZjU3MDFi ZjY3Y2E0MzBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMDItMjMgIE1hcnRp biBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHdGtdIEZsYXNoIGl0ZW0gcGxhY2VkIG9uIHdy b25nIGxvY2F0aW9uIHJpZ2h0IGFmdGVyIGxvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTM3NzY5CisKKyAgICAgICAgSWYgYSBwbHVnaW4gaXMgR3Rr U29ja2V0IGJhc2VkLCBkbyBub3Qgc2V0IHRoZSB3aWRnZXQgYWxsb2NhdGlvbiB1bnRpbCB0aGUK KyAgICAgICAgd2luZG93IGlzIGFjdHVhbGx5IGVtYmVkZGVkIGluIHRoZSBwYXJlbnQuIFdoZW4g dGhlIHdpbmRvdyBpcyBlbWJlZGRlZCwgdXNlCisgICAgICAgIGFueSBwZW5kaW5nIGFsbG9jYXRp b24gZm9yIHRoZSBjYWxsIHRvIGd0a193aWRnZXRfc2l6ZV9hbGxvY2F0ZS4gVGhpcyBidWcKKyAg ICAgICAgc2VlbXMgdG8gb25seSBhcHBlYXIgd2l0aCBGbGFzaCBtb3ZpZXMgbG9hZGVkIGFzIHRo ZSBzcmMgb2YgYW4gaWZyYW1lLgorCisgICAgICAgICogbWFudWFsLXRlc3RzL3BsdWdpbnMvd2lu ZG93ZWQtaW4taWZyYW1lLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBsdWdpbnMvUGx1Z2luVmll dy5oOiBBZGQgYSBmZXcgbmV3IG1lbWJlcnMgdG8gdHJhY2sgd2luZG93IGVtYmVkZGluZyBzdGF0 ZS4KKyAgICAgICAgKiBwbHVnaW5zL2d0ay9QbHVnaW5WaWV3R3RrLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlBsdWdpblZpZXc6OnNldE5QV2luZG93SWZOZWVkZWQpOiBJZiB0aGlzIGlzIGEgR3Rr U29ja2V0LWJhc2VkIHBsdWdpbgorICAgICAgICB3YWl0IHVudGlsIHRoZSBwbHVnLWFkZGVkIHNp Z25hbCBmaXJlcyB0byBzZXQgdGhlIHdpZGdldCBhbGxvY2F0aW9uLgorICAgICAgICAoV2ViQ29y ZTo6UGx1Z2luVmlldzo6cGx1Z0FkZGVkQ2FsbGJhY2spOiBVcGRhdGVkIHRvIGJlIGEgc3RhdGlj IG1ldGhvZCwgc28gdGhhdAorICAgICAgICB3ZSBjYW4gYWNjZXNzIHByaXZhdGUgbWVtYmVycy4g SWYgdGhlcmUgaXMgYSBwZW5kaW5nIGFsbG9jYXRpb24sIGNhbGwgZ3RrX3dpZGdldF9zaXplX2Fs bG9jYXRlCisgICAgICAgIHdpdGggaXQuCisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3Ojpw bGF0Zm9ybVN0YXJ0KTogVXBkYXRlIHRoZSBwbHVnaW4gc3RhdGUsIHNvIHRoYXQgd2UgZG8gbm90 CisgICAgICAgIGNhbGwgZ3RrX3dpZGdldF9zaXplX2FsbG9jYXRlIGlmIHRoZSB3aW5kb3cgaXNu J3QgZW1iZWRkZWQuCisKIDIwMTEtMDItMjMgIFJlbmF0YSBIb2RvdmFuICA8cmVuaUB3ZWJraXQu b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5pa29sYXMgWmltbWVybWFubi4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL21hbnVhbC10ZXN0cy9wbHVnaW5zL3dpbmRvd2VkLWluLWlmcmFt ZS5odG1sIGIvU291cmNlL1dlYkNvcmUvbWFudWFsLXRlc3RzL3BsdWdpbnMvd2luZG93ZWQtaW4t aWZyYW1lLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZmRiOTM3Yzg2YTVkZDczNDRhYzUzYWFmZjEyZjQ5MWNk MzI3ODBkZAotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL21hbnVhbC10ZXN0cy9w bHVnaW5zL3dpbmRvd2VkLWluLWlmcmFtZS5odG1sCkBAIC0wLDAgKzEsMjEgQEAKKzxodG1sIHht bG5zPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hodG1sIj4KKworPGhlYWQ+Cis8bWV0YSBodHRw LWVxdWl2PSJDb250ZW50LVR5cGUiIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD1VVEYtOCIg Lz4KKzx0aXRsZT5GbGFzaCBJbiBJRnJhbWUgVGVzdCBGaWxlPC90aXRsZT4KKzwvaGVhZD4KKwor PGJvZHk+CisKKyAgICA8Yj4gVGhpcyBtYW51YWwgdGVzdHMgdmVyaWZpZXMgdGhhdCB3aGVuIGEg cGx1Z2luIGlzIGxvYWRlZCBhcyB0aGUgc3JjIG9mIGFuIGlmcmFtZQorICAgICAgICBhbmQgdGhh dCBpZnJhbWUgaXMgb3V0c2lkZSBvZiB0aGUgdmlld3BvcnQgb2YgdGhlIHBhZ2UsIHRoZSBwbHVn aW4gZG9lcyBub3QgYXBwZWFyCisgICAgICAgIGluIHRoZSB1cHBlciBsZWZ0IG9mIHRoZSBmcmFt ZS4gV2hlbiB0aGlzIHBhZ2UgbG9hZHMgeW91IHNob3VsZCBub3Qgc2VlIHRoZSBGbGFzaCBtb3Zp ZS4KKyAgICAgICAgSXQgc2hvdWxkIGJlIHNob3duIG9ubHkgYWZ0ZXIgeW91IHNjcm9sbCB0byB0 aGUgYm90dG9tIG9mIHRoZSBwYWdlLiBUaGlzIHdhcyBhIHByb2JsZW0gZm9yCisgICAgICAgIEdU SysgaW4gPGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3 NzY5Ij5idWcgMzc3Njk8L2E+PC9iPiA8YnIvPjxici8+CisgICAgPGRpdiBzdHlsZT0iaGVpZ2h0 OjIwMDBweDsiPiZuYnNwOzwvZGl2PgorCisgICAgPGlmcmFtZSB3aWR0aD0iNjAwIiBoZWlnaHQ9 IjM2OCIgc3JjPSJ0ZXN0LnN3ZiIgZnJhbWVib3JkZXI9IjAiIGFsbG93ZnVsbHNjcmVlbj48L2lm cmFtZT4KKzxiciBjbGVhcj0iYWxsIj4KKzwvYm9keT4KKworPC9odG1sPgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wbHVn aW5zL1BsdWdpblZpZXcuaAppbmRleCA4ZjhmMTNmNjU5ZjViNDM2MzljOWU0MjQzOGIzYjdjYTU2 MWU2MmI0Li5kYWU2MjZlMDgwMTA2N2IzNTM3N2MyYzljMGIxZjFiMDFkODU2Zjk4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXcuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbHVnaW5zL1BsdWdpblZpZXcuaApAQCAtNjQsNiArNjQsMTEgQEAgUVRfQkVHSU5fTkFN RVNQQUNFCiBjbGFzcyBRUGFpbnRlcjsKIFFUX0VORF9OQU1FU1BBQ0UKICNlbmRpZgorI2lmIFBM QVRGT1JNKEdUSykKKyNpbmNsdWRlICJHT3duUHRyR3RrLmgiCit0eXBlZGVmIHN0cnVjdCBfR3Rr U29ja2V0IEd0a1NvY2tldDsKK3R5cGVkZWYgc3RydWN0IF9HZGtSZWN0YW5nbGUgR3RrQWxsb2Nh dGlvbjsKKyNlbmRpZgogCiAjaWYgVVNFKEpTQykKIG5hbWVzcGFjZSBKU0MgewpAQCAtNDMyLDYg KzQzNywxMyBAQCBwcml2YXRlOgogI2VuZGlmCiAjZW5kaWYgLy8gUExBVEZPUk0oUVQpCiAKKyNp ZiBQTEFURk9STShHVEspCisgICAgICAgIHN0YXRpYyBnYm9vbGVhbiBwbHVnUmVtb3ZlZENhbGxi YWNrKEd0a1NvY2tldCosIFBsdWdpblZpZXcqKTsKKyAgICAgICAgc3RhdGljIHZvaWQgcGx1Z0Fk ZGVkQ2FsbGJhY2soR3RrU29ja2V0KiwgUGx1Z2luVmlldyopOworICAgICAgICBib29sIG1fcGx1 Z0FkZGVkOworICAgICAgICBHT3duUHRyPEd0a0FsbG9jYXRpb24+IG1fZGVsYXllZEFsbG9jYXRp b247CisjZW5kaWYKKwogICAgICAgICBJbnRSZWN0IG1fY2xpcFJlY3Q7IC8vIFRoZSBjbGlwIHJl Y3QgdG8gYXBwbHkgdG8gYSB3aW5kb3dlZCBwbHVnLWluCiAgICAgICAgIEludFJlY3QgbV93aW5k b3dSZWN0OyAvLyBPdXIgd2luZG93IHJlY3QuCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsdWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9n dGsvUGx1Z2luVmlld0d0ay5jcHAKaW5kZXggZWM4NTVhMjQ3NzJmNDI3NzI3YmIxZjU2NWI2MDU0 MTU2OWFhZTY2NS4uY2VlY2FkMzJmMDc0ODU4YmNjYjA5YTcyYzM0NDNkMmE3MDQwNjFjYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvUGx1Z2luVmlld0d0ay5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvUGx1Z2luVmlld0d0ay5jcHAKQEAgLTUxMywx NiArNTEzLDI4IEBAIHZvaWQgUGx1Z2luVmlldzo6c2V0TlBXaW5kb3dJZk5lZWRlZCgpCiAgICAg c2V0Q2FsbGluZ1BsdWdpbihmYWxzZSk7CiAgICAgUGx1Z2luVmlldzo6c2V0Q3VycmVudFBsdWdp blZpZXcoMCk7CiAKLSAgICBpZiAobV9pc1dpbmRvd2VkKSB7Ci0gICAgICAgIEd0a0FsbG9jYXRp b24gYWxsb2NhdGlvbiA9IHsgbV93aW5kb3dSZWN0LngoKSwgbV93aW5kb3dSZWN0LnkoKSwgbV93 aW5kb3dSZWN0LndpZHRoKCksIG1fd2luZG93UmVjdC5oZWlnaHQoKSB9OwotICAgICAgICBndGtf d2lkZ2V0X3NpemVfYWxsb2NhdGUocGxhdGZvcm1QbHVnaW5XaWRnZXQoKSwgJmFsbG9jYXRpb24p OworICAgIGlmICghbV9pc1dpbmRvd2VkKQorICAgICAgICByZXR1cm47CisKICNpZiBkZWZpbmVk KFhQX1VOSVgpCi0gICAgICAgIGlmICghbV9uZWVkc1hFbWJlZCkgewotICAgICAgICAgICAgZ3Rr X3h0YmluX3NldF9wb3NpdGlvbihHVEtfWFRCSU4ocGxhdGZvcm1QbHVnaW5XaWRnZXQoKSksIG1f d2luZG93UmVjdC54KCksIG1fd2luZG93UmVjdC55KCkpOwotICAgICAgICAgICAgZ3RrX3h0Ymlu X3Jlc2l6ZShwbGF0Zm9ybVBsdWdpbldpZGdldCgpLCBtX3dpbmRvd1JlY3Qud2lkdGgoKSwgbV93 aW5kb3dSZWN0LmhlaWdodCgpKTsKLSAgICAgICAgfQorICAgIC8vIEd0a1h0QmluIHdpbGwgY2Fs bCBndGtfd2lkZ2V0X3NpemVfYWxsb2NhdGUsIHNvIHdlIGRvbid0IG5lZWQgdG8gZG8gaXQgaGVy ZS4KKyAgICBpZiAoIW1fbmVlZHNYRW1iZWQpIHsKKyAgICAgICAgZ3RrX3h0YmluX3NldF9wb3Np dGlvbihHVEtfWFRCSU4ocGxhdGZvcm1QbHVnaW5XaWRnZXQoKSksIG1fd2luZG93UmVjdC54KCks IG1fd2luZG93UmVjdC55KCkpOworICAgICAgICBndGtfeHRiaW5fcmVzaXplKHBsYXRmb3JtUGx1 Z2luV2lkZ2V0KCksIG1fd2luZG93UmVjdC53aWR0aCgpLCBtX3dpbmRvd1JlY3QuaGVpZ2h0KCkp OworICAgICAgICByZXR1cm47CisgICAgfQogI2VuZGlmCisKKyAgICBHdGtBbGxvY2F0aW9uIGFs bG9jYXRpb24gPSB7IG1fd2luZG93UmVjdC54KCksIG1fd2luZG93UmVjdC55KCksIG1fd2luZG93 UmVjdC53aWR0aCgpLCBtX3dpbmRvd1JlY3QuaGVpZ2h0KCkgfTsKKworICAgIC8vIElmIHRoZSB3 aW5kb3cgaGFzIG5vdCBiZWVuIGVtYmVkZGVkIHlldCAodGhlIHBsdWcgYWRkZWQpLCB3ZSBkZWxh eSBzZXR0aW5nIGl0cyBhbGxvY2F0aW9uIHVudGlsIAorICAgIC8vIHRoYXQgcG9pbnQuIFRoaXMg Zml4ZXMgaXNzdWVzIHdpdGggc29tZSBKYXZhIHBsdWdpbiBpbnN0YW5jZXMgbm90IHJlbmRlcmlu ZyBpbW1lZGlhdGVseS4KKyAgICBpZiAoIW1fcGx1Z0FkZGVkKSB7CisgICAgICAgIG1fZGVsYXll ZEFsbG9jYXRpb24uc2V0KHN0YXRpY19jYXN0PEd0a0FsbG9jYXRpb24qPihnX21hbGxvYyhzaXpl b2YoR3RrQWxsb2NhdGlvbikpKSk7CisgICAgICAgICoobV9kZWxheWVkQWxsb2NhdGlvbi5nZXQo KSkgPSBhbGxvY2F0aW9uOworICAgICAgICByZXR1cm47CiAgICAgfQorICAgIGd0a193aWRnZXRf c2l6ZV9hbGxvY2F0ZShwbGF0Zm9ybVBsdWdpbldpZGdldCgpLCAmYWxsb2NhdGlvbik7CiB9CiAK IHZvaWQgUGx1Z2luVmlldzo6c2V0UGFyZW50VmlzaWJsZShib29sIHZpc2libGUpCkBAIC03NDMs MjUgKzc1NSwyMiBAQCBzdGF0aWMgdm9pZCBnZXRWaXN1YWxBbmRDb2xvcm1hcChpbnQgZGVwdGgs IFZpc3VhbCoqIHZpc3VhbCwgQ29sb3JtYXAqIGNvbG9ybWFwKQogfQogI2VuZGlmCiAKLXN0YXRp YyBnYm9vbGVhbiBwbHVnUmVtb3ZlZENhbGxiYWNrKEd0a1NvY2tldCogc29ja2V0LCBncG9pbnRl cikKK2dib29sZWFuIFBsdWdpblZpZXc6OnBsdWdSZW1vdmVkQ2FsbGJhY2soR3RrU29ja2V0KiBz b2NrZXQsIFBsdWdpblZpZXcqIHZpZXcpCiB7CisgICAgdmlldy0+bV9wbHVnQWRkZWQgPSBmYWxz ZTsKICAgICByZXR1cm4gVFJVRTsKIH0KIAotc3RhdGljIHZvaWQgcGx1Z0FkZGVkQ2FsbGJhY2so R3RrU29ja2V0KiBzb2NrZXQsIFBsdWdpblZpZXcqIHZpZXcpCit2b2lkIFBsdWdpblZpZXc6OnBs dWdBZGRlZENhbGxiYWNrKEd0a1NvY2tldCogc29ja2V0LCBQbHVnaW5WaWV3KiB2aWV3KQogewot ICAgIGlmICghc29ja2V0IHx8ICF2aWV3KQotICAgICAgICByZXR1cm47CisgICAgQVNTRVJUKHNv Y2tldCk7CisgICAgQVNTRVJUKHZpZXcpOwogCi0gICAgLy8gRklYTUU6IEphdmEgUGx1Z2lucyBk byBub3Qgc2VlbSB0byBkcmF3IHRoZW1zZWx2ZXMgcHJvcGVybHkgdGhlCi0gICAgLy8gZmlyc3Qg dGltZSB1bmxlc3Mgd2UgZG8gYSBzaXplLWFsbG9jYXRlIGFmdGVyIHRoZXkgaGF2ZSBkb25lCi0g ICAgLy8gdGhlIHBsdWcgb3BlcmF0aW9uIG9uIHRoZWlyIHNpZGUsIHdoaWNoIGluIGdlbmVyYWwg ZG9lcyBub3QKLSAgICAvLyBoYXBwZW4gc2luY2Ugd2UgZG8gc2l6ZS1hbGxvY2F0ZXMgYmVmb3Jl IHNldHRpbmcgdGhlCi0gICAgLy8gTlBXaW5kb3cuIEFwcGx5IHRoaXMgd29ya2Fyb3VuZCB1bnRp bCB3ZSBmaWd1cmUgb3V0IGEgYmV0dGVyCi0gICAgLy8gc29sdXRpb24sIGlmIGFueS4KLSAgICBJ bnRSZWN0IHJlY3QgPSB2aWV3LT5mcmFtZVJlY3QoKTsKLSAgICBHdGtBbGxvY2F0aW9uIGFsbG9j YXRpb24gPSB7IHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgp IH07Ci0gICAgZ3RrX3dpZGdldF9zaXplX2FsbG9jYXRlKEdUS19XSURHRVQoc29ja2V0KSwgJmFs bG9jYXRpb24pOworICAgIHZpZXctPm1fcGx1Z0FkZGVkID0gdHJ1ZTsKKyAgICBpZiAodmlldy0+ bV9kZWxheWVkQWxsb2NhdGlvbikgeworICAgICAgICBndGtfd2lkZ2V0X3NpemVfYWxsb2NhdGUo R1RLX1dJREdFVChzb2NrZXQpLCB2aWV3LT5tX2RlbGF5ZWRBbGxvY2F0aW9uLmdldCgpKTsKKyAg ICAgICAgdmlldy0+bV9kZWxheWVkQWxsb2NhdGlvbi5jbGVhcigpOworICAgIH0KIH0KIAogYm9v bCBQbHVnaW5WaWV3OjpwbGF0Zm9ybVN0YXJ0KCkKQEAgLTc5MCwxMCArNzk5LDExIEBAIGJvb2wg UGx1Z2luVmlldzo6cGxhdGZvcm1TdGFydCgpCiAgICAgICAgICAgICBpZiAoIWd0a193aWRnZXRf Z2V0X3BhcmVudChwYWdlQ2xpZW50KSkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAK KyAgICAgICAgICAgIG1fcGx1Z0FkZGVkID0gZmFsc2U7CiAgICAgICAgICAgICBzZXRQbGF0Zm9y bVdpZGdldChndGtfc29ja2V0X25ldygpKTsKICAgICAgICAgICAgIGd0a19jb250YWluZXJfYWRk KEdUS19DT05UQUlORVIocGFnZUNsaWVudCksIHBsYXRmb3JtUGx1Z2luV2lkZ2V0KCkpOwotICAg ICAgICAgICAgZ19zaWduYWxfY29ubmVjdChwbGF0Zm9ybVBsdWdpbldpZGdldCgpLCAicGx1Zy1h ZGRlZCIsIEdfQ0FMTEJBQ0socGx1Z0FkZGVkQ2FsbGJhY2spLCB0aGlzKTsKLSAgICAgICAgICAg IGdfc2lnbmFsX2Nvbm5lY3QocGxhdGZvcm1QbHVnaW5XaWRnZXQoKSwgInBsdWctcmVtb3ZlZCIs IEdfQ0FMTEJBQ0socGx1Z1JlbW92ZWRDYWxsYmFjayksIE5VTEwpOworICAgICAgICAgICAgZ19z aWduYWxfY29ubmVjdChwbGF0Zm9ybVBsdWdpbldpZGdldCgpLCAicGx1Zy1hZGRlZCIsIEdfQ0FM TEJBQ0soUGx1Z2luVmlldzo6cGx1Z0FkZGVkQ2FsbGJhY2spLCB0aGlzKTsKKyAgICAgICAgICAg IGdfc2lnbmFsX2Nvbm5lY3QocGxhdGZvcm1QbHVnaW5XaWRnZXQoKSwgInBsdWctcmVtb3ZlZCIs IEdfQ0FMTEJBQ0soUGx1Z2luVmlldzo6cGx1Z1JlbW92ZWRDYWxsYmFjayksIHRoaXMpOwogICAg ICAgICB9IGVsc2UKICAgICAgICAgICAgIHNldFBsYXRmb3JtV2lkZ2V0KGd0a194dGJpbl9uZXco cGFnZUNsaWVudCwgMCkpOwogI2Vsc2UK