85103 2012-04-27 15:32:25 -0700 [Texmap] TextureMapperLayer uses intermediate surfaces too eagerly 2012-04-30 07:07:31 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 noam noam jturcotte mrobinson webkit.review.bot oldest_to_newest 611947 0 noam 2012-04-27 15:32:25 -0700 [Texmap] TextureMapperLayer uses intermediate surfaces too eagerly 611954 1 139293 noam 2012-04-27 15:39:09 -0700 Created attachment 139293 Patch 612420 2 139293 kenneth 2012-04-29 04:00:08 -0700 Comment on attachment 139293 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139293&action=review > Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:221 > + return MoreThanOneDescendantWithContent; MultipleDecendantsWithContent > Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:231 > + count = 1; What is the idea with setting it to 1 here and continue iterating? wont you end inside the same if and return MoreThanOne? > Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:254 > + bool mightHaveOverlaps = countDescendantsWithContent() == MoreThanOneDescendantWithContent; canOverlap? 612444 3 139404 noam 2012-04-29 12:04:12 -0700 Created attachment 139404 Patch 612597 4 139404 webkit.review.bot 2012-04-30 07:07:26 -0700 Comment on attachment 139404 Patch Clearing flags on attachment: 139404 Committed r115629: <http://trac.webkit.org/changeset/115629> 612598 5 webkit.review.bot 2012-04-30 07:07:31 -0700 All reviewed patches have been landed. Closing bug. 139293 2012-04-27 15:39:09 -0700 2012-04-29 12:04:08 -0700 Patch bug-85103-20120427153906.patch text/plain 4918 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1Mzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTAzODdkMzhmY2ZkZjg5 MjAyMmM4YjMxNmM3ZTU5YzEwMDc2OWEwOS4uZjk2NjE1N2YzY2U0NzJjNzIzZTg1ZGQ0MTI4OTA2 NWE3YmY2Mzk5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDEyLTA0LTI3ICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CiAKKyAgICAgICAgW1RleG1h cF0gVGV4dHVyZU1hcHBlckxheWVyIHVzZXMgaW50ZXJtZWRpYXRlIHN1cmZhY2VzIHRvbyBlYWdl cmx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTEw MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE9ubHkg dXNlIGFuIGludGVybWVkaWF0ZSBzdXJmYWNlIHdoZW4gdGhlcmUgYXJlIHR3byBvciBtb3JlIGxh eWVycyBpbgorICAgICAgICB0aGUgY3VycmVudCB0cmVlIHRoYXQgYWN0dWFsbHkgaGF2ZSBjb250 ZW50cy4gVGhpcyByZWR1Y2VzIHRoZSB1c2Ugb2YKKyAgICAgICAgaW50ZXJtZWRpYXRlIHN1cmZh Y2VzIChGQk9zKSBpbiBjYXNlcyB3aGVyZSBhIGdlb21ldHJ5LW9ubHkgbGF5ZXIgaGFzCisgICAg ICAgIG9wYWNpdHksIGFuZCBoYXMgYSBzaW5nbGUgY2hpbGQgd2l0aCB0aGUgYWN0dWFsIGNvbnRl bnQsIGZvciBleGFtcGxlIGluCisgICAgICAgIHRoZSBsZWF2ZXMgZGVtby4KKworICAgICAgICBD b3ZlcmVkIGJ5IGV4aXN0aW5nIGNvbXBvc2l0aW5nIHRlc3RzLgorCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpUZXh0dXJlTWFwcGVyTGF5ZXI6OmNvdW50RGVzY2VuZGFudHNXaXRoQ29udGVudCk6Cisg ICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJMYXllcjo6 c2hvdWxkUGFpbnRUb0ludGVybWVkaWF0ZVN1cmZhY2UpOgorICAgICAgICAoV2ViQ29yZTo6VGV4 dHVyZU1hcHBlckxheWVyOjpwYWludFJlY3Vyc2l2ZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5oOgorICAgICAgICAoVGV4dHVyZU1hcHBl ckxheWVyKToKKworMjAxMi0wNC0yNyAgTm8nYW0gUm9zZW50aGFsICA8bm9hbS5yb3NlbnRoYWxA bm9raWEuY29tPgorCiAgICAgICAgIFtUZXhtYXBdIExlYXZlcyBkZW1vOiB3cm9uZyBnZW9tZXRy eSB3aGVuIG9wYWNpdHkgYW5pbWF0aW9uIGtpY2tzIGluCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTA5NgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIu Y3BwCmluZGV4IDQwYjI5MTU1NGIxOWVhY2MwNjBhMTI0ZmYwYWJjYzgwZWFhYjk1YzYuLjJjMTU4 YmNjZmJlNjM1YTY0NWQzNmM5YmY5ZmZjNGRhNzUwYjQzODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVy TGF5ZXIuY3BwCkBAIC0yMTQsMzAgKzIxNCw1NSBAQCBJbnRSZWN0IFRleHR1cmVNYXBwZXJMYXll cjo6aW50ZXJtZWRpYXRlU3VyZmFjZVJlY3QoY29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmCiAg ICAgcmV0dXJuIHJlY3Q7CiB9CiAKK1RleHR1cmVNYXBwZXJMYXllcjo6RGVzY2VuZGFudENvbnRl bnRDb3VudCBUZXh0dXJlTWFwcGVyTGF5ZXI6OmNvdW50RGVzY2VuZGFudHNXaXRoQ29udGVudCgp IGNvbnN0Cit7CisgICAgaW50IGNvdW50ID0gKG1fc3RhdGUuZHJhd3NDb250ZW50ID8gMSA6IDAp ICsgKG1fY29udGVudHNMYXllciA/IDEgOiAwKTsKKyAgICBpZiAoY291bnQgPiAxKQorICAgICAg ICByZXR1cm4gTW9yZVRoYW5PbmVEZXNjZW5kYW50V2l0aENvbnRlbnQ7CisgICAgZm9yIChpbnQg aSA9IDA7IGkgPCBtX2NoaWxkcmVuLnNpemUoKTsgKytpKSB7CisgICAgICAgIERlc2NlbmRhbnRD b250ZW50Q291bnQgY2hpbGRDb3VudCA9IG1fY2hpbGRyZW5baV0tPmNvdW50RGVzY2VuZGFudHNX aXRoQ29udGVudCgpOworICAgICAgICBpZiAoY2hpbGRDb3VudCA9PSBNb3JlVGhhbk9uZURlc2Nl bmRhbnRXaXRoQ29udGVudCkKKyAgICAgICAgICAgIHJldHVybiBNb3JlVGhhbk9uZURlc2NlbmRh bnRXaXRoQ29udGVudDsKKworICAgICAgICBpZiAoY2hpbGRDb3VudCA9PSBPbmVEZXNjZW5kYW50 V2l0aENvbnRlbnQpIHsKKyAgICAgICAgICAgIGlmIChjb3VudCA9PSAxKQorICAgICAgICAgICAg ICAgIHJldHVybiBNb3JlVGhhbk9uZURlc2NlbmRhbnRXaXRoQ29udGVudDsKKworICAgICAgICAg ICAgY291bnQgPSAxOworICAgICAgICB9CisgICAgfQorCisgICAgcmV0dXJuIE9uZURlc2NlbmRh bnRXaXRoQ29udGVudDsKK30KKwogYm9vbCBUZXh0dXJlTWFwcGVyTGF5ZXI6OnNob3VsZFBhaW50 VG9JbnRlcm1lZGlhdGVTdXJmYWNlKCkgY29uc3QKIHsKICNpZiBFTkFCTEUoQ1NTX0ZJTFRFUlMp CiAgICAgaWYgKG1fc3RhdGUuZmlsdGVycy5zaXplKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwog I2VuZGlmCisgICAgLy8gV2UgZG9uJ3QgdXNlIHR3by1wYXNzIGJsZW5kaW5nIGZvciBwcmVzZXJ2 ZXMtM2QsIHRoYXQncyBpbiBzeW5jIHdpdGggU2FmYXJpLgorICAgIGlmIChtX3N0YXRlLnByZXNl cnZlczNEKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBib29sIGhhc09wYWNpdHkgPSBt X29wYWNpdHkgPCAwLjk5OwotICAgIGJvb2wgaGFzQ2hpbGRyZW4gPSAhbV9jaGlsZHJlbi5pc0Vt cHR5KCk7Ci0gICAgYm9vbCBoYXNSZXBsaWNhID0gISFtX3N0YXRlLnJlcGxpY2FMYXllcjsKICAg ICBib29sIGhhc01hc2sgPSAhIW1fc3RhdGUubWFza0xheWVyOwogCi0gICAgLy8gV2UgZG9uJ3Qg dXNlIHR3by1wYXNzIGJsZW5kaW5nIGZvciBwcmVzZXJ2ZXMtM2QsIHRoYXQncyBpbiBzeW5jIHdp dGggU2FmYXJpLgotICAgIGlmIChtX3N0YXRlLnByZXNlcnZlczNEKQorICAgIGlmICghaGFzT3Bh Y2l0eSAmJiAhaGFzTWFzaykKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgYm9vbCBtaWdo dEhhdmVPdmVybGFwcyA9IGNvdW50RGVzY2VuZGFudHNXaXRoQ29udGVudCgpID09IE1vcmVUaGFu T25lRGVzY2VuZGFudFdpdGhDb250ZW50OworICAgIGJvb2wgaGFzUmVwbGljYSA9ICEhbV9zdGF0 ZS5yZXBsaWNhTGF5ZXI7CisKICAgICAvLyBXZSBzaG91bGQgdXNlIGFuIGludGVybWVkaWF0ZSBz dXJmYWNlIHdoZW4gYmxlbmRpbmcgc2V2ZXJhbCBpdGVtcyB3aXRoIGFuIGFuY2VzdG9yIG9wYWNp dHkuCiAgICAgLy8gVGVzdGVkIGJ5IGNvbXBvc2l0aW5nL3JlZmxlY3Rpb25zL3JlZmxlY3Rpb24t b3BhY2l0eS5odG1sCi0gICAgaWYgKGhhc09wYWNpdHkgJiYgKGhhc0NoaWxkcmVuIHx8IGhhc1Jl cGxpY2EpKQorICAgIGlmIChoYXNPcGFjaXR5ICYmIChtaWdodEhhdmVPdmVybGFwcyB8fCBoYXNS ZXBsaWNhKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICAvLyBXZSBzaG91bGQgdXNlIGFu IGludGVybWVkaWF0ZSBzdXJmYWNlIHdpdGggYSBtYXNrZWQgYW5jZXN0b3IuCiAgICAgLy8gSW4g dGhlIGNhc2Ugb2YgcmVwbGljYXMgdGhlIG1hc2sgaXMgYXBwbGllZCBiZWZvcmUgcmVwbGljYXRp bmcuCiAgICAgLy8gVGVzdGVkIGJ5IGNvbXBvc2l0aW5nL21hc2tzL21hc2tlZC1hbmNlc3Rvci5o dG1sCi0gICAgaWYgKGhhc01hc2sgJiYgaGFzQ2hpbGRyZW4gJiYgIWhhc1JlcGxpY2EpCisgICAg aWYgKGhhc01hc2sgJiYgbWlnaHRIYXZlT3ZlcmxhcHMgJiYgIWhhc1JlcGxpY2EpCiAgICAgICAg IHJldHVybiB0cnVlOwogCiAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5o CmluZGV4IGY4MDBiNmYzMDQzZTczYzhjNzBhN2JiN2JmZWQyN2MyMjgzMjRjZGIuLjAxY2Y4MmUy ZjA2OWNiZTk0YTUwODdiZDQ0Nzk2YjcwMzE0NzJkZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVy LmgKQEAgLTE1OCw2ICsxNTgsMTQgQEAgcHJpdmF0ZToKICAgICBib29sIGlzVmlzaWJsZSgpIGNv bnN0OwogICAgIGJvb2wgc2hvdWxkUGFpbnRUb0ludGVybWVkaWF0ZVN1cmZhY2UoKSBjb25zdDsK IAorICAgIGVudW0gRGVzY2VuZGFudENvbnRlbnRDb3VudCB7CisgICAgICAgIE5vRGVzY2VuZGFu dHNXaXRoQ29udGVudCwKKyAgICAgICAgT25lRGVzY2VuZGFudFdpdGhDb250ZW50LAorICAgICAg ICBNb3JlVGhhbk9uZURlc2NlbmRhbnRXaXRoQ29udGVudAorICAgIH07CisKKyAgICBEZXNjZW5k YW50Q29udGVudENvdW50IGNvdW50RGVzY2VuZGFudHNXaXRoQ29udGVudCgpIGNvbnN0OworCiAg ICAgTGF5ZXJUcmFuc2Zvcm0gbV90cmFuc2Zvcm07CiAKICAgICBpbmxpbmUgRmxvYXRSZWN0IGxh eWVyUmVjdCgpIGNvbnN0Cg== 139404 2012-04-29 12:04:12 -0700 2012-04-30 07:07:26 -0700 Patch bug-85103-20120429120411.patch text/plain 4372 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1NTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjcyZTBlMTQ3ZjE5ZWRh YjgyNzQzODk4NzQyMjlhMzU1MjE2MjI0Yi4uNjYwMGZhNDhiZDY5MDg1YjEzYmM1NjRjMzE0NTIw ZmIwYzAwOTFkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA0LTI5ICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgW1RleG1h cF0gVGV4dHVyZU1hcHBlckxheWVyIHVzZXMgaW50ZXJtZWRpYXRlIHN1cmZhY2VzIHRvbyBlYWdl cmx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTEw MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3Rl YWQgb2YgYXV0b21hdGljYWxseSB1c2luZyBhbiBpbnRlcm1lZGlhdGUgc3VyZmFjZSBmb3IgbGF5 ZXJzIHdpdGggb3BhY2l0eSBhbmQKKyAgICAgICAgY2hpbGRyZW4sIHdlIGxpbWl0IHN1cmZhY2Ug dXNhZ2UgZm9yIGxheWVycyB3aXRoIG1vcmUgdGhhbiBvbmUgY2hpbGQgYW5kIGZvciBsYXllcnMg d2l0aAorICAgICAgICBvbmUgY2hpbGQgYW5kIGNvbnRlbnRzIG9mIGl0cyBvd24uCisKKyAgICAg ICAgVGhpcyBwcmV2ZW50cyB1cyBmcm9tIHVzaW5nIGludGVybWVkaWF0ZSBzdXJmYWNlcyBpbiBj YXNlcyB3aGVyZSBhIHNpbmdsZSBsYXllciB3aXRoCisgICAgICAgIG9wYWNpdHkgaGFzIGEgc2lu Z2xlIGRlc2NlbmRhbnQgd2l0aCBjb250ZW50LCBpbiB3aGljaCBjYXNlIG5vcm1hbCBibGVuZGlu ZyBjYW4gYmUgdXNlZC4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIGNvbXBvc2l0aW5n IGxheW91dCB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0 dXJlTWFwcGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5oOgorCiAyMDEyLTA0LTI3ICBO bydhbSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CiAKICAgICAgICAgW1Rl eG1hcF0gTGVhdmVzIGRlbW86IHdyb25nIGdlb21ldHJ5IHdoZW4gb3BhY2l0eSBhbmltYXRpb24g a2lja3MgaW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Rl eG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHAKaW5kZXggNDBiMjkxNTU0YjE5ZWFj YzA2MGExMjRmZjBhYmNjODBlYWFiOTVjNi4uOWM4NDY0MmNiNjQ4OTljNzI5YmM2OWZiYzliMGUx OGVlNjE1YmFjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv dGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHAKQEAgLTIxNCw2ICsyMTQs MjMgQEAgSW50UmVjdCBUZXh0dXJlTWFwcGVyTGF5ZXI6OmludGVybWVkaWF0ZVN1cmZhY2VSZWN0 KGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JgogICAgIHJldHVybiByZWN0OwogfQogCitUZXh0 dXJlTWFwcGVyTGF5ZXI6OkNvbnRlbnRzTGF5ZXJDb3VudCBUZXh0dXJlTWFwcGVyTGF5ZXI6OmNv dW50UG90ZW50aWFsTGF5ZXJzV2l0aENvbnRlbnRzKCkgY29uc3QKK3sKKyAgICBpbnQgc2VsZkxh eWVyc1dpdGhDb250ZW50cyA9IChtX3N0YXRlLmRyYXdzQ29udGVudCA/IDEgOiAwKSArIChtX2Nv bnRlbnRzTGF5ZXIgPyAxIDogMCk7CisgICAgaW50IHBvdGVudGlhbExheWVyc1dpdGhDb250ZW50 cyA9IHNlbGZMYXllcnNXaXRoQ29udGVudHMgKyBtX2NoaWxkcmVuLnNpemUoKTsKKworICAgIGlm ICghcG90ZW50aWFsTGF5ZXJzV2l0aENvbnRlbnRzKQorICAgICAgICByZXR1cm4gTm9MYXllcnNX aXRoQ29udGVudDsKKworICAgIGlmIChwb3RlbnRpYWxMYXllcnNXaXRoQ29udGVudHMgPiAxKQor ICAgICAgICByZXR1cm4gTXVsdGlwbGVMYXllcnNXaXRoQ29udGVudHM7CisKKyAgICBpZiAobV9j aGlsZHJlbi5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBTaW5nbGVMYXllcldpdGhDb250ZW50 czsKKworICAgIHJldHVybiBtX2NoaWxkcmVuLmZpcnN0KCktPmNvdW50UG90ZW50aWFsTGF5ZXJz V2l0aENvbnRlbnRzKCk7Cit9CisKIGJvb2wgVGV4dHVyZU1hcHBlckxheWVyOjpzaG91bGRQYWlu dFRvSW50ZXJtZWRpYXRlU3VyZmFjZSgpIGNvbnN0CiB7CiAjaWYgRU5BQkxFKENTU19GSUxURVJT KQpAQCAtMjIxLDcgKzIzOCw3IEBAIGJvb2wgVGV4dHVyZU1hcHBlckxheWVyOjpzaG91bGRQYWlu dFRvSW50ZXJtZWRpYXRlU3VyZmFjZSgpIGNvbnN0CiAgICAgICAgIHJldHVybiB0cnVlOwogI2Vu ZGlmCiAgICAgYm9vbCBoYXNPcGFjaXR5ID0gbV9vcGFjaXR5IDwgMC45OTsKLSAgICBib29sIGhh c0NoaWxkcmVuID0gIW1fY2hpbGRyZW4uaXNFbXB0eSgpOworICAgIGJvb2wgY2FuSGF2ZU11bHRp cGxlTGF5ZXJzV2l0aENvbnRlbnQgPSBjb3VudFBvdGVudGlhbExheWVyc1dpdGhDb250ZW50cygp ID09IE11bHRpcGxlTGF5ZXJzV2l0aENvbnRlbnRzOwogICAgIGJvb2wgaGFzUmVwbGljYSA9ICEh bV9zdGF0ZS5yZXBsaWNhTGF5ZXI7CiAgICAgYm9vbCBoYXNNYXNrID0gISFtX3N0YXRlLm1hc2tM YXllcjsKIApAQCAtMjMxLDEzICsyNDgsMTMgQEAgYm9vbCBUZXh0dXJlTWFwcGVyTGF5ZXI6OnNo b3VsZFBhaW50VG9JbnRlcm1lZGlhdGVTdXJmYWNlKCkgY29uc3QKIAogICAgIC8vIFdlIHNob3Vs ZCB1c2UgYW4gaW50ZXJtZWRpYXRlIHN1cmZhY2Ugd2hlbiBibGVuZGluZyBzZXZlcmFsIGl0ZW1z IHdpdGggYW4gYW5jZXN0b3Igb3BhY2l0eS4KICAgICAvLyBUZXN0ZWQgYnkgY29tcG9zaXRpbmcv cmVmbGVjdGlvbnMvcmVmbGVjdGlvbi1vcGFjaXR5Lmh0bWwKLSAgICBpZiAoaGFzT3BhY2l0eSAm JiAoaGFzQ2hpbGRyZW4gfHwgaGFzUmVwbGljYSkpCisgICAgaWYgKGhhc09wYWNpdHkgJiYgKGNh bkhhdmVNdWx0aXBsZUxheWVyc1dpdGhDb250ZW50IHx8IGhhc1JlcGxpY2EpKQogICAgICAgICBy ZXR1cm4gdHJ1ZTsKIAogICAgIC8vIFdlIHNob3VsZCB1c2UgYW4gaW50ZXJtZWRpYXRlIHN1cmZh Y2Ugd2l0aCBhIG1hc2tlZCBhbmNlc3Rvci4KICAgICAvLyBJbiB0aGUgY2FzZSBvZiByZXBsaWNh cyB0aGUgbWFzayBpcyBhcHBsaWVkIGJlZm9yZSByZXBsaWNhdGluZy4KICAgICAvLyBUZXN0ZWQg YnkgY29tcG9zaXRpbmcvbWFza3MvbWFza2VkLWFuY2VzdG9yLmh0bWwKLSAgICBpZiAoaGFzTWFz ayAmJiBoYXNDaGlsZHJlbiAmJiAhaGFzUmVwbGljYSkKKyAgICBpZiAoaGFzTWFzayAmJiBjYW5I YXZlTXVsdGlwbGVMYXllcnNXaXRoQ29udGVudCAmJiAhaGFzUmVwbGljYSkKICAgICAgICAgcmV0 dXJuIHRydWU7CiAKICAgICByZXR1cm4gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmgKaW5k ZXggZjgwMGI2ZjMwNDNlNzNjOGM3MGE3YmI3YmZlZDI3YzIyODMyNGNkYi4uMTcyY2E1Y2IxNDhl NWI5MTY1NWMzZTk2MThkYjZhNTgxNWViN2YxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuaApA QCAtMTU2LDYgKzE1NiwxMyBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBzeW5jQW5pbWF0aW9ucygp OwogICAgIGJvb2wgaXNWaXNpYmxlKCkgY29uc3Q7CisgICAgZW51bSBDb250ZW50c0xheWVyQ291 bnQgeworICAgICAgICBOb0xheWVyc1dpdGhDb250ZW50LAorICAgICAgICBTaW5nbGVMYXllcldp dGhDb250ZW50cywKKyAgICAgICAgTXVsdGlwbGVMYXllcnNXaXRoQ29udGVudHMKKyAgICB9Owor CisgICAgQ29udGVudHNMYXllckNvdW50IGNvdW50UG90ZW50aWFsTGF5ZXJzV2l0aENvbnRlbnRz KCkgY29uc3Q7CiAgICAgYm9vbCBzaG91bGRQYWludFRvSW50ZXJtZWRpYXRlU3VyZmFjZSgpIGNv bnN0OwogCiAgICAgTGF5ZXJUcmFuc2Zvcm0gbV90cmFuc2Zvcm07Cg==