57433 2011-03-30 02:16:36 -0700 clean up Document's handling of title changes 2011-03-31 03:41:19 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 evan evan abarth ap eric rniwa webkit.review.bot oldest_to_newest 376140 0 evan 2011-03-30 02:16:36 -0700 clean up Document's handling of title changes 376148 1 87488 evan 2011-03-30 02:34:35 -0700 Created attachment 87488 Patch 376151 2 evan 2011-03-30 02:39:07 -0700 Ryosuke, let me know if this is what you were suggesting I do. 376173 3 87488 rniwa 2011-03-30 03:34:59 -0700 Comment on attachment 87488 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87488&action=review > Source/WebCore/dom/Document.cpp:1354 > + if (m_titleElement) Okay, so this code is valid because only HTMLTitleElement and SVGTitleElement calls setTitleElement with an arbitrary element but that's not entirely obvious to me. Please assert that m_titleElement->hasTagName(titleTag). But I'd also prefer to have the condition in the if statement as well because otherwise we'll be introducing a security vulnerability if we ever hit the assertion. 376187 4 evan 2011-03-30 04:22:04 -0700 Committed r82422: <http://trac.webkit.org/changeset/82422> 376221 5 webkit.review.bot 2011-03-30 05:44:58 -0700 http://trac.webkit.org/changeset/82422 might have broken Windows XP Debug (Tests) 376412 6 ap 2011-03-30 09:53:47 -0700 + if (!isHTMLDocument()) + m_titleElement = 0; What happens in the case of XHTML documents? 377039 7 evan 2011-03-31 03:41:19 -0700 I'm not sure if your comment is about the prior code or the new code. I tried pretty hard to not change the behavior of the code, so please let me know if I got that wrong. As for the prior code: For some context, m_titleElement is attempting to track the element that we are deriving the Document's title from. That is important so its contents can be updated if JS does 'document.title="foo"'. We only learn about these title elements if the title element notifies the Document via setTitle("...", this) (this is the function I renamed to setTitleElement in this change). It seems isHTMLDocument() is false for XHTML documents, but they still use HTMLTitleElement? So in that case, the code you quoted clears the reference from Document to the element, and so document.title=... doesn't keep it in sync. I just verified this with a local xhtml file. That is to say, the following does something different in XHTML vs HTML. <head><title id='t'>test</title></head> <body> <script>document.title = 'foo'; console.log(document.getElementById('t').innerText);</script> Thankfully, Ryosuke had me add an extra bit of verification before I landed the patch, so at least I didn't make it worse. I will open a bug about it. https://bugs.webkit.org/show_bug.cgi?id=57537 87488 2011-03-30 02:34:35 -0700 2011-03-30 03:34:59 -0700 Patch bug-57433-20110330023858.patch text/plain 7677 evan U3VidmVyc2lvbiBSZXZpc2lvbjogODIyNDQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmYzQyZjZjNjgxZTcyNTU0 M2E4ZGRjNTg0ZWIxMmRiNDBiNDExYjI1Li5kYjU2MDVlNjczYzFmNzNhNTA5M2UwNTVkODAzMzli Mjk2NmJmMjM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTEtMDMtMzAgIEV2YW4g TWFydGluICA8ZXZhbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgY2xlYW4gdXAgRG9jdW1lbnQncyBoYW5kbGluZyBvZiB0aXRs ZSBjaGFuZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01NzQzMworCisgICAgICAgIERvY3VtZW50OjpzZXRUaXRsZSBoYXMgdHdvIGVudHJ5IHBvaW50 czoKKyAgICAgICAgMSkgZnJvbSBET00gYmluZGluZ3MsIGxpa2UgZG9jdW1lbnQudGl0bGU9ImZv byIKKyAgICAgICAgMikgZnJvbSB0aXRsZSB0YWdzLCBsaWtlIDx0aXRsZT5mb288L3RpdGxlPiBp biBIVE1MCisKKyAgICAgICAgU3BsaXQgdGhlc2UgdHdvIGNvZGUgcGF0aHMgdG8gbWFrZSB0aGUg Y29kZSBlYXNpZXIgdG8gZm9sbG93LgorICAgICAgICBBbHNvLCByZXBsYWNlIHRoZSByZXBlYXRl ZCBwYXR0ZXJuIG9mCisgICAgICAgICAgICBtX3Jhd1RpdGxlID0gImZvbyI7IHVwZGF0ZVRpdGxl KCk7CisgICAgICAgIHdpdGgKKyAgICAgICAgICAgIHVwZGF0ZVRpdGxlKCJmb28iKTsKKworICAg ICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6dXBk YXRlVGl0bGUpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnNldFRpdGxlKToKKyAgICAg ICAgKFdlYkNvcmU6OkRvY3VtZW50OjpzZXRUaXRsZUVsZW1lbnQpOgorICAgICAgICAoV2ViQ29y ZTo6RG9jdW1lbnQ6OnJlbW92ZVRpdGxlKToKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuaDoKKyAg ICAgICAgKiBodG1sL0hUTUxUaXRsZUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRN TFRpdGxlRWxlbWVudDo6aW5zZXJ0ZWRJbnRvRG9jdW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTFRpdGxlRWxlbWVudDo6Y2hpbGRyZW5DaGFuZ2VkKToKKyAgICAgICAgKiBzdmcvU1ZHVGl0 bGVFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR1RpdGxlRWxlbWVudDo6aW5zZXJ0 ZWRJbnRvRG9jdW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6U1ZHVGl0bGVFbGVtZW50OjpjaGls ZHJlbkNoYW5nZWQpOgorCiAyMDExLTAzLTI5ICBMZW8gWWFuZyAgPGxlby55YW5nQHRvcmNobW9i aWxlLmNvbS5jbj4KIAogICAgICAgICBSZXZpZXdlZCBieSBOaWtvbGFzIFppbW1lcm1hbm4uCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNv cmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCA4ZTk1ODViZGJiMjYxYzNmOWE2YjE1NTMzY2E3NzE3 M2QyODM4MTlhLi45M2EyODJmMDA1OWEzODlkZWVhNTgyZDI4NjVjMGY4MTQxNjk4YjRhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTEzMjMsNDMgKzEzMjMsNDggQEAgc3RhdGljIGlubGlu ZSBTdHJpbmcgY2Fub25pY2FsaXplZFRpdGxlKERvY3VtZW50KiBkb2N1bWVudCwgY29uc3QgU3Ry aW5nJiB0aXRsZSkKICAgICByZXR1cm4gU3RyaW5nOjphZG9wdChidWZmZXIpOwogfQogCi12b2lk IERvY3VtZW50Ojp1cGRhdGVUaXRsZSgpCit2b2lkIERvY3VtZW50Ojp1cGRhdGVUaXRsZShjb25z dCBTdHJpbmcmIHRpdGxlKQogeworICAgIGlmIChtX3Jhd1RpdGxlID09IHRpdGxlKQorICAgICAg ICByZXR1cm47CisKKyAgICBtX3Jhd1RpdGxlID0gdGl0bGU7CiAgICAgbV90aXRsZSA9IGNhbm9u aWNhbGl6ZWRUaXRsZSh0aGlzLCBtX3Jhd1RpdGxlKTsKICAgICBpZiAoRnJhbWUqIGYgPSBmcmFt ZSgpKQogICAgICAgICBmLT5sb2FkZXIoKS0+c2V0VGl0bGUobV90aXRsZSk7CiB9CiAKLXZvaWQg RG9jdW1lbnQ6OnNldFRpdGxlKGNvbnN0IFN0cmluZyYgdGl0bGUsIEVsZW1lbnQqIHRpdGxlRWxl bWVudCkKK3ZvaWQgRG9jdW1lbnQ6OnNldFRpdGxlKGNvbnN0IFN0cmluZyYgdGl0bGUpCiB7Ci0g ICAgaWYgKCF0aXRsZUVsZW1lbnQpIHsKLSAgICAgICAgLy8gVGl0bGUgc2V0IGJ5IEphdmFTY3Jp cHQgLS0gb3ZlcnJpZGVzIGFueSB0aXRsZSBlbGVtZW50cy4KLSAgICAgICAgbV90aXRsZVNldEV4 cGxpY2l0bHkgPSB0cnVlOwotICAgICAgICBpZiAoIWlzSFRNTERvY3VtZW50KCkpCi0gICAgICAg ICAgICBtX3RpdGxlRWxlbWVudCA9IDA7Ci0gICAgICAgIGVsc2UgaWYgKCFtX3RpdGxlRWxlbWVu dCkgewotICAgICAgICAgICAgaWYgKEhUTUxFbGVtZW50KiBoZWFkRWxlbWVudCA9IGhlYWQoKSkg ewotICAgICAgICAgICAgICAgIG1fdGl0bGVFbGVtZW50ID0gY3JlYXRlRWxlbWVudCh0aXRsZVRh ZywgZmFsc2UpOwotICAgICAgICAgICAgICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwotICAgICAg ICAgICAgICAgIGhlYWRFbGVtZW50LT5hcHBlbmRDaGlsZChtX3RpdGxlRWxlbWVudCwgZWMpOwot ICAgICAgICAgICAgICAgIEFTU0VSVCghZWMpOwotICAgICAgICAgICAgfQorICAgIC8vIFRpdGxl IHNldCBieSBKYXZhU2NyaXB0IC0tIG92ZXJyaWRlcyBhbnkgdGl0bGUgZWxlbWVudHMuCisgICAg bV90aXRsZVNldEV4cGxpY2l0bHkgPSB0cnVlOworICAgIGlmICghaXNIVE1MRG9jdW1lbnQoKSkK KyAgICAgICAgbV90aXRsZUVsZW1lbnQgPSAwOworICAgIGVsc2UgaWYgKCFtX3RpdGxlRWxlbWVu dCkgeworICAgICAgICBpZiAoSFRNTEVsZW1lbnQqIGhlYWRFbGVtZW50ID0gaGVhZCgpKSB7Cisg ICAgICAgICAgICBtX3RpdGxlRWxlbWVudCA9IGNyZWF0ZUVsZW1lbnQodGl0bGVUYWcsIGZhbHNl KTsKKyAgICAgICAgICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOworICAgICAgICAgICAgaGVhZEVs ZW1lbnQtPmFwcGVuZENoaWxkKG1fdGl0bGVFbGVtZW50LCBlYyk7CisgICAgICAgICAgICBBU1NF UlQoIWVjKTsKICAgICAgICAgfQotICAgIH0gZWxzZSBpZiAodGl0bGVFbGVtZW50ICE9IG1fdGl0 bGVFbGVtZW50KSB7CisgICAgfQorCisgICAgdXBkYXRlVGl0bGUodGl0bGUpOworCisgICAgaWYg KG1fdGl0bGVFbGVtZW50KQorICAgICAgICBzdGF0aWNfY2FzdDxIVE1MVGl0bGVFbGVtZW50Kj4o bV90aXRsZUVsZW1lbnQuZ2V0KCkpLT5zZXRUZXh0KG1fdGl0bGUpOworfQorCit2b2lkIERvY3Vt ZW50OjpzZXRUaXRsZUVsZW1lbnQoY29uc3QgU3RyaW5nJiB0aXRsZSwgRWxlbWVudCogdGl0bGVF bGVtZW50KQoreworICAgIGlmICh0aXRsZUVsZW1lbnQgIT0gbV90aXRsZUVsZW1lbnQpIHsKICAg ICAgICAgaWYgKG1fdGl0bGVFbGVtZW50IHx8IG1fdGl0bGVTZXRFeHBsaWNpdGx5KQotICAgICAg ICAgICAgLy8gT25seSBhbGxvdyB0aGUgZmlyc3QgdGl0bGUgZWxlbWVudCB0byBjaGFuZ2UgdGhl IHRpdGxlIC0tIG90aGVycyBoYXZlIG5vIGVmZmVjdC4KKyAgICAgICAgICAgIC8vIE9ubHkgbGV0 IHRoZSBmaXJzdCBzZXQgdGl0bGUgY2hhbmdlIHRoZSB0aXRsZSAtLSBsYXRlciBjaGFuZ2VzIGhh dmUgbm8gZWZmZWN0LgogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBtX3RpdGxlRWxlbWVu dCA9IHRpdGxlRWxlbWVudDsKICAgICB9CiAKLSAgICBpZiAobV9yYXdUaXRsZSA9PSB0aXRsZSkK LSAgICAgICAgcmV0dXJuOwotCi0gICAgbV9yYXdUaXRsZSA9IHRpdGxlOwotICAgIHVwZGF0ZVRp dGxlKCk7Ci0KLSAgICBpZiAobV90aXRsZVNldEV4cGxpY2l0bHkgJiYgbV90aXRsZUVsZW1lbnQg JiYgbV90aXRsZUVsZW1lbnQtPmhhc1RhZ05hbWUodGl0bGVUYWcpICYmICF0aXRsZUVsZW1lbnQp Ci0gICAgICAgIHN0YXRpY19jYXN0PEhUTUxUaXRsZUVsZW1lbnQqPihtX3RpdGxlRWxlbWVudC5n ZXQoKSktPnNldFRleHQobV90aXRsZSk7CisgICAgdXBkYXRlVGl0bGUodGl0bGUpOwogfQogCiB2 b2lkIERvY3VtZW50OjpyZW1vdmVUaXRsZShFbGVtZW50KiB0aXRsZUVsZW1lbnQpCkBAIC0xMzc1 LDE1ICsxMzgwLDEzIEBAIHZvaWQgRG9jdW1lbnQ6OnJlbW92ZVRpdGxlKEVsZW1lbnQqIHRpdGxl RWxlbWVudCkKICAgICAgICAgZm9yIChOb2RlKiBlID0gaGVhZEVsZW1lbnQtPmZpcnN0Q2hpbGQo KTsgZTsgZSA9IGUtPm5leHRTaWJsaW5nKCkpCiAgICAgICAgICAgICBpZiAoZS0+aGFzVGFnTmFt ZSh0aXRsZVRhZykpIHsKICAgICAgICAgICAgICAgICBIVE1MVGl0bGVFbGVtZW50KiB0aXRsZUVs ZW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MVGl0bGVFbGVtZW50Kj4oZSk7Ci0gICAgICAgICAgICAg ICAgc2V0VGl0bGUodGl0bGVFbGVtZW50LT50ZXh0KCksIHRpdGxlRWxlbWVudCk7CisgICAgICAg ICAgICAgICAgc2V0VGl0bGVFbGVtZW50KHRpdGxlRWxlbWVudC0+dGV4dCgpLCB0aXRsZUVsZW1l bnQpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgIH0KIAotICAg IGlmICghbV90aXRsZUVsZW1lbnQgJiYgIW1fcmF3VGl0bGUuaXNFbXB0eSgpKSB7Ci0gICAgICAg IG1fcmF3VGl0bGUgPSAiIjsKLSAgICAgICAgdXBkYXRlVGl0bGUoKTsKLSAgICB9CisgICAgaWYg KCFtX3RpdGxlRWxlbWVudCkKKyAgICAgICAgdXBkYXRlVGl0bGUoIiIpOwogfQogCiBTdHJpbmcg RG9jdW1lbnQ6Om5vZGVOYW1lKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKaW5kZXggNzMyY2Vm ZDllMjI5NTkwZjhmYjg5ZTg2NTg4NjRiZTlmZjhmMWYxZi4uMDVkZmI3NmVmNTFmZDE1MTBlMTAz ODEzNTFlY2NjMGMxM2RhNTdhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKQEAgLTgxMiw3ICs4MTIs OCBAQCBwdWJsaWM6CiAgICAgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lckVsZW1lbnQoKSBj b25zdDsKIAogICAgIFN0cmluZyB0aXRsZSgpIGNvbnN0IHsgcmV0dXJuIG1fdGl0bGU7IH0KLSAg ICB2b2lkIHNldFRpdGxlKGNvbnN0IFN0cmluZyYsIEVsZW1lbnQqIHRpdGxlRWxlbWVudCA9IDAp OworICAgIHZvaWQgc2V0VGl0bGUoY29uc3QgU3RyaW5nJik7CisgICAgdm9pZCBzZXRUaXRsZUVs ZW1lbnQoY29uc3QgU3RyaW5nJiB0aXRsZSwgRWxlbWVudCogdGl0bGVFbGVtZW50KTsKICAgICB2 b2lkIHJlbW92ZVRpdGxlKEVsZW1lbnQqIHRpdGxlRWxlbWVudCk7CiAKICAgICBTdHJpbmcgY29v a2llKEV4Y2VwdGlvbkNvZGUmKSBjb25zdDsKQEAgLTExNTcsNyArMTE1OCw3IEBAIHByaXZhdGU6 CiAKICAgICBTdHJpbmcgZW5jb2RpbmcoKSBjb25zdDsKIAotICAgIHZvaWQgdXBkYXRlVGl0bGUo KTsKKyAgICB2b2lkIHVwZGF0ZVRpdGxlKGNvbnN0IFN0cmluZyYgdGl0bGUpOwogICAgIHZvaWQg dXBkYXRlRm9jdXNBcHBlYXJhbmNlVGltZXJGaXJlZChUaW1lcjxEb2N1bWVudD4qKTsKICAgICB2 b2lkIHVwZGF0ZUJhc2VVUkwoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MVGl0bGVFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRpdGxlRWxlbWVu dC5jcHAKaW5kZXggMzFiMWIyYmNkMmI4ZTRlMWE2MzhhNzUwOGJkMDdlYjdmYWE3NzViMi4uNzhj OGI2YTcxMzkyMWRjZjA2ZjU3Mzc1MTgyYWYxMTFmODIxODllMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MVGl0bGVFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxUaXRsZUVsZW1lbnQuY3BwCkBAIC00Niw3ICs0Niw3IEBAIFBhc3NSZWZQdHI8SFRN TFRpdGxlRWxlbWVudD4gSFRNTFRpdGxlRWxlbWVudDo6Y3JlYXRlKGNvbnN0IFF1YWxpZmllZE5h bWUmIHRhZ05hCiB2b2lkIEhUTUxUaXRsZUVsZW1lbnQ6Omluc2VydGVkSW50b0RvY3VtZW50KCkK IHsKICAgICBIVE1MRWxlbWVudDo6aW5zZXJ0ZWRJbnRvRG9jdW1lbnQoKTsKLSAgICBkb2N1bWVu dCgpLT5zZXRUaXRsZShtX3RpdGxlLCB0aGlzKTsKKyAgICBkb2N1bWVudCgpLT5zZXRUaXRsZUVs ZW1lbnQobV90aXRsZSwgdGhpcyk7CiB9CiAKIHZvaWQgSFRNTFRpdGxlRWxlbWVudDo6cmVtb3Zl ZEZyb21Eb2N1bWVudCgpCkBAIC01OSw3ICs1OSw3IEBAIHZvaWQgSFRNTFRpdGxlRWxlbWVudDo6 Y2hpbGRyZW5DaGFuZ2VkKGJvb2wgY2hhbmdlZEJ5UGFyc2VyLCBOb2RlKiBiZWZvcmVDaGFuZ2Us CiB7CiAgICAgbV90aXRsZSA9IHRleHQoKTsKICAgICBpZiAoaW5Eb2N1bWVudCgpKQotICAgICAg ICBkb2N1bWVudCgpLT5zZXRUaXRsZShtX3RpdGxlLCB0aGlzKTsKKyAgICAgICAgZG9jdW1lbnQo KS0+c2V0VGl0bGVFbGVtZW50KG1fdGl0bGUsIHRoaXMpOwogICAgIEhUTUxFbGVtZW50OjpjaGls ZHJlbkNoYW5nZWQoY2hhbmdlZEJ5UGFyc2VyLCBiZWZvcmVDaGFuZ2UsIGFmdGVyQ2hhbmdlLCBj aGlsZENvdW50RGVsdGEpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZH VGl0bGVFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdUaXRsZUVsZW1lbnQuY3Bw CmluZGV4IDYyODFmMTBiMTRmZDE0ZjU4N2E5ZWMyOTEyYzhlZTkyM2M3MzE5OTguLmViY2RkYjQ2 YTAyOWQ5YjM0ZGNlYzI1NWEyYThjZGIxYjViMTgxZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3N2Zy9TVkdUaXRsZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdU aXRsZUVsZW1lbnQuY3BwCkBAIC00MCw3ICs0MCw3IEBAIHZvaWQgU1ZHVGl0bGVFbGVtZW50Ojpp bnNlcnRlZEludG9Eb2N1bWVudCgpCiB7CiAgICAgU1ZHU3R5bGVkRWxlbWVudDo6aW5zZXJ0ZWRJ bnRvRG9jdW1lbnQoKTsKICAgICBpZiAoZmlyc3RDaGlsZCgpKQotICAgICAgICBkb2N1bWVudCgp LT5zZXRUaXRsZSh0ZXh0Q29udGVudCgpLCB0aGlzKTsKKyAgICAgICAgZG9jdW1lbnQoKS0+c2V0 VGl0bGVFbGVtZW50KHRleHRDb250ZW50KCksIHRoaXMpOwogfQogCiB2b2lkIFNWR1RpdGxlRWxl bWVudDo6cmVtb3ZlZEZyb21Eb2N1bWVudCgpCkBAIC01Myw3ICs1Myw3IEBAIHZvaWQgU1ZHVGl0 bGVFbGVtZW50OjpjaGlsZHJlbkNoYW5nZWQoYm9vbCBjaGFuZ2VkQnlQYXJzZXIsIE5vZGUqIGJl Zm9yZUNoYW5nZSwKIHsKICAgICBTVkdFbGVtZW50OjpjaGlsZHJlbkNoYW5nZWQoY2hhbmdlZEJ5 UGFyc2VyLCBiZWZvcmVDaGFuZ2UsIGFmdGVyQ2hhbmdlLCBjaGlsZENvdW50RGVsdGEpOwogICAg IGlmIChpbkRvY3VtZW50KCkpCi0gICAgICAgIGRvY3VtZW50KCktPnNldFRpdGxlKHRleHRDb250 ZW50KCksIHRoaXMpOworICAgICAgICBkb2N1bWVudCgpLT5zZXRUaXRsZUVsZW1lbnQodGV4dENv bnRlbnQoKSwgdGhpcyk7CiB9CiAKIEF0dHJpYnV0ZVRvUHJvcGVydHlUeXBlTWFwJiBTVkdUaXRs ZUVsZW1lbnQ6OmF0dHJpYnV0ZVRvUHJvcGVydHlUeXBlTWFwKCkK