90273 2012-06-29 04:58:38 -0700 Optimize Element::hasAttribute() by replacing String with AtomicString 2012-08-08 01:44:17 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 90246 1 haraken haraken ap cmarcelo rniwa webkit.review.bot oldest_to_newest 660375 0 haraken 2012-06-29 04:58:38 -0700 Based on the observation described in this ChangeLog (http://trac.webkit.org/changeset/121439), the performance of Element::hasAttribute() can be optimized by replacing String with AtomicString. 660384 1 150144 haraken 2012-06-29 05:10:30 -0700 Created attachment 150144 Performance test 660386 2 150146 haraken 2012-06-29 05:12:16 -0700 Created attachment 150146 Patch 680235 3 150146 abarth 2012-07-27 01:04:22 -0700 Comment on attachment 150146 Patch Based on further discussion in #webkit, my current understanding is that ap is ok with these patches. I'm going to r+ them, but please give ap a chance to respond before landing. 680596 4 150146 darin 2012-07-27 07:08:12 -0700 Comment on attachment 150146 Patch This is faster in some cases. But a case I’d expect this makes slower is when the passed-in attribute name is uppercase. This adds a lookup in the atomic string table of the not-yet-lowercased string. 689711 5 150146 haraken 2012-08-07 18:21:47 -0700 Comment on attachment 150146 Patch Looks like no strong objection, let me commit it. 689742 6 150146 webkit.review.bot 2012-08-07 18:49:33 -0700 Comment on attachment 150146 Patch Rejecting attachment 150146 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: cceeded at 1 with fuzz 3. patching file Source/WebCore/dom/Element.cpp Hunk #1 succeeded at 1532 with fuzz 2 (offset 38 lines). Hunk #2 FAILED at 1502. 1 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/dom/Element.cpp.rej patching file Source/WebCore/dom/Element.h Hunk #1 succeeded at 141 with fuzz 1 (offset 2 lines). Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'Adam Barth']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/13459033 689762 7 157086 haraken 2012-08-07 19:20:20 -0700 Created attachment 157086 patch for landing 690054 8 157086 webkit.review.bot 2012-08-08 01:43:38 -0700 Comment on attachment 157086 patch for landing Clearing flags on attachment: 157086 Committed r125009: <http://trac.webkit.org/changeset/125009> 150144 2012-06-29 05:10:30 -0700 2012-06-29 05:10:30 -0700 Performance test has_attribute_upload.html text/html 1584 haraken PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8Ym9keT4KPHNjcmlwdD4KZnVuY3Rpb24gcnVuKHRpdGxl LCByZXBlYXROdW0sIGZ1bmMsIHJvdW5kcykgewogIHZhciByZXN1bHQgPSBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgicmVzdWx0Iik7CiAgaWYgKCFyZXN1bHQpIHsKICAgIHZhciByZXN1bHQgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hp bGQocmVzdWx0KTsKICB9CgogIHZhciByb3VuZHMgPSByb3VuZHMgfHwgNTsKICB2YXIgdGltZXMg PSBbXTsKICBmb3IgKHZhciByID0gMDsgciA8IHJvdW5kczsgcisrKSB7CiAgICB2YXIgc3RhcnQg PSBEYXRlLm5vdygpOwogICAgZnVuYyhyZXBlYXROdW0pOwogICAgdmFyIHRpbWUgPSBEYXRlLm5v dygpIC0gc3RhcnQ7CiAgICB0aW1lcy5wdXNoKHRpbWUpOwogICAgcmVzdWx0LmFwcGVuZENoaWxk KGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKHRpbWUpKTsKICAgIHJlc3VsdC5hcHBlbmRDaGlsZChk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJiciIpKTsKICB9CgogIHRpbWVzLnNvcnQoZnVuY3Rpb24g KGEsIGIpIHsgcmV0dXJuIGEgLSBiOyB9KTsKICB2YXIgbWVkaWFuID0gdGltZXNbTWF0aC5mbG9v cih0aW1lcy5sZW5ndGggLyAyKV07CiAgdmFyIG1pbiA9IHRpbWVzWzBdOwogIHZhciBtYXggPSB0 aW1lc1t0aW1lcy5sZW5ndGggLSAxXTsKICB2YXIgc3VtID0gMDsKICBmb3IgKHZhciBpID0gMDsg aSA8IHRpbWVzLmxlbmd0aDsgaSsrKSB7CiAgICBzdW0gKz0gdGltZXNbaV07CiAgfQoKICByZXN1 bHQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUodGl0bGUgKyAiIDogbWVhbj0i ICsgKHN1bSAvIHJvdW5kcykudG9GaXhlZCgyKSArICJtcywgbWluPSIgKyBtaW4gKyAibXMsIG1l ZGlhbj0iICsgbWVkaWFuICsgIm1zLCBtYXg9IiArIG1heCArICJtcyIpKTsKICByZXN1bHQuYXBw ZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnIiKSk7Cn0KCndpbmRvdy5vbmxvYWQg PSBmdW5jdGlvbiAoKSB7CiAgdmFyIHJlcGVhdE51bSA9IDUwMDAwMDA7CiAgdmFyIGdsb2JhbERp diA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogIGRvY3VtZW50LmJvZHkuYXBwZW5k Q2hpbGQoZ2xvYmFsRGl2KTsKCiAgcnVuKCJoYXNBdHRyaWJ1dGUiLCByZXBlYXROdW0sIGZ1bmN0 aW9uKHJlcGVhdE51bSkgewogICAgdmFyIGRpdiA9IGdsb2JhbERpdjsKICAgIGRpdi5jbGFzc05h bWUgPSAiZm9vIjsKICAgIGZvciAodmFyIGogPSAwOyBqIDwgcmVwZWF0TnVtOyBqKyspIHsKICAg ICAgZGl2Lmhhc0F0dHJpYnV0ZSgiY2xhc3MiKTsKICAgIH0KICB9KTsKCiAgcnVuKCJoYXNBdHRy aWJ1dGVOUyIsIHJlcGVhdE51bSwgZnVuY3Rpb24ocmVwZWF0TnVtKSB7CiAgICB2YXIgZGl2ID0g Z2xvYmFsRGl2OwogICAgZGl2LmNsYXNzTmFtZSA9ICJmb28iOwogICAgZm9yICh2YXIgaiA9IDA7 IGogPCByZXBlYXROdW07IGorKykgewogICAgICBkaXYuaGFzQXR0cmlidXRlTlMoIiIsICJjbGFz cyIpOwogICAgfQogIH0pOwp9Cjwvc2NyaXB0Pgo8L2JvZHk+CjwvaHRtbD4K 150146 2012-06-29 05:12:16 -0700 2012-08-08 01:44:08 -0700 Patch bug-90273-20120629211216.patch text/plain 3517 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxNTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWY2NGFjNWQ0Yjc4YWJm NDNhMDVjZGY1Y2Y5ZTgyMDdlMTA5ZWU1NC4uYzc2ODVmMDQxZGU1YmI0MzhiOTRiMGU2ZGJjYjA1 YzU2OTJkOGZkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDEyLTA2LTI5ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBPcHRpbWl6ZSBFbGVt ZW50OjpoYXNBdHRyaWJ1dGUoKSBieSByZXBsYWNpbmcgU3RyaW5nIHdpdGggQXRvbWljU3RyaW5n CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDI3Mwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJhc2VkIG9u IHRoZSBvYnNlcnZhdGlvbiBkZXNjcmliZWQgaW4gdGhpcyBDaGFuZ2VMb2cKKyAgICAgICAgKGh0 dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzEyMTQzOSksIHRoaXMgcGF0Y2ggb3B0aW1p emVzIHRoZQorICAgICAgICBwZXJmb3JtYW5jZSBvZiBFbGVtZW50OjpoYXNBdHRyaWJ1dGUoKSBi eSByZXBsYWNpbmcgU3RyaW5nIHdpdGggQXRvbWljU3RyaW5nLgorCisgICAgICAgIFBlcmZvcm1h bmNlIHRlc3Q6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL2F0dGFjaG1lbnQuY2dpP2lkPTE1MDE0 NAorCisgICAgICAgIGhhc0F0dHJpYnV0ZSAoQ2hyb21pdW0vTGludXgpOgorICAgICAgICAzMjku NjBtcyA9PiAyNTkuMDBtcworCisgICAgICAgIGhhc0F0dHJpYnV0ZU5TIChDaHJvbWl1bS9MaW51 eCk6CisgICAgICAgIDU0OS42MG1zID0+IDQzNS44MG1zCisKKyAgICAgICAgKiBkb20vRWxlbWVu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpoYXNBdHRyaWJ1dGUpOgorICAgICAg ICAoV2ViQ29yZTo6RWxlbWVudDo6aGFzQXR0cmlidXRlTlMpOgorICAgICAgICAqIGRvbS9FbGVt ZW50Lmg6CisgICAgICAgIChFbGVtZW50KToKKworMjAxMi0wNi0yOSAgS2VudGFybyBIYXJhICA8 aGFyYWtlbkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQg cjEyMTUyMC4KICAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTIxNTIw CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDI0Ngpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNv cmUvZG9tL0VsZW1lbnQuY3BwCmluZGV4IGViYzBjOWI1M2QzNWJiYzBkZmQ1ODk1ZTUyMWQwMDky YWMyYTM5ZjkuLmI4ODk4OGE2NTQxYzUyN2M5MTEyYTljZWUxM2FjZTIwM2E0MGExNmMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9kb20vRWxlbWVudC5jcHAKQEAgLTE0OTQsNyArMTQ5NCw3IEBAIFBhc3NSZWZQdHI8QXR0cj4g RWxlbWVudDo6Z2V0QXR0cmlidXRlTm9kZU5TKGNvbnN0IFN0cmluZyYgbmFtZXNwYWNlVVJJLCBj b25zdCBTCiAgICAgcmV0dXJuIGF0dHJpYnV0ZURhdGEtPmdldEF0dHJpYnV0ZU5vZGUoUXVhbGlm aWVkTmFtZShudWxsQXRvbSwgbG9jYWxOYW1lLCBuYW1lc3BhY2VVUkkpLCB0aGlzKTsKIH0KIAot Ym9vbCBFbGVtZW50OjpoYXNBdHRyaWJ1dGUoY29uc3QgU3RyaW5nJiBuYW1lKSBjb25zdAorYm9v bCBFbGVtZW50OjpoYXNBdHRyaWJ1dGUoY29uc3QgQXRvbWljU3RyaW5nJiBuYW1lKSBjb25zdAog ewogICAgIEVsZW1lbnRBdHRyaWJ1dGVEYXRhKiBhdHRyaWJ1dGVEYXRhID0gdXBkYXRlZEF0dHJp YnV0ZURhdGEoKTsKICAgICBpZiAoIWF0dHJpYnV0ZURhdGEpCkBAIC0xNTAyLDExICsxNTAyLDEx IEBAIGJvb2wgRWxlbWVudDo6aGFzQXR0cmlidXRlKGNvbnN0IFN0cmluZyYgbmFtZSkgY29uc3QK IAogICAgIC8vIFRoaXMgY2FsbCB0byBTdHJpbmc6Omxvd2VyKCkgc2VlbXMgdG8gYmUgcmVxdWly ZWQgYnV0CiAgICAgLy8gdGhlcmUgbWF5IGJlIGEgd2F5IHRvIHJlbW92ZSBpdC4KLSAgICBTdHJp bmcgbG9jYWxOYW1lID0gc2hvdWxkSWdub3JlQXR0cmlidXRlQ2FzZSh0aGlzKSA/IG5hbWUubG93 ZXIoKSA6IG5hbWU7CisgICAgQXRvbWljU3RyaW5nIGxvY2FsTmFtZSA9IHNob3VsZElnbm9yZUF0 dHJpYnV0ZUNhc2UodGhpcykgPyBuYW1lLmxvd2VyKCkgOiBuYW1lOwogICAgIHJldHVybiBhdHRy aWJ1dGVEYXRhLT5nZXRBdHRyaWJ1dGVJdGVtKGxvY2FsTmFtZSwgZmFsc2UpOwogfQogCi1ib29s IEVsZW1lbnQ6Omhhc0F0dHJpYnV0ZU5TKGNvbnN0IFN0cmluZyYgbmFtZXNwYWNlVVJJLCBjb25z dCBTdHJpbmcmIGxvY2FsTmFtZSkgY29uc3QKK2Jvb2wgRWxlbWVudDo6aGFzQXR0cmlidXRlTlMo Y29uc3QgQXRvbWljU3RyaW5nJiBuYW1lc3BhY2VVUkksIGNvbnN0IEF0b21pY1N0cmluZyYgbG9j YWxOYW1lKSBjb25zdAogewogICAgIEVsZW1lbnRBdHRyaWJ1dGVEYXRhKiBhdHRyaWJ1dGVEYXRh ID0gdXBkYXRlZEF0dHJpYnV0ZURhdGEoKTsKICAgICBpZiAoIWF0dHJpYnV0ZURhdGEpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnQuaAppbmRleCBlNGY3MGNmYWI4YmFmZDhiNTM4YjVjZWZlMjJmOTg5YmIyM2U1OWEz Li4wYTkzZWVlYzg4NDBlNjMwNzliZDk3ODE5MTQ5MmRhMjE0ZDA3NGExIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVt ZW50LmgKQEAgLTEzOSw4ICsxMzksOCBAQCBwdWJsaWM6CiAgICAgLy8gaW4gc3R5bGUgYXR0cmli dXRlIG9yIG9uZSBvZiB0aGUgU1ZHIGFuaW1hdGlvbiBhdHRyaWJ1dGVzLgogICAgIGJvb2wgaGFz QXR0cmlidXRlc1dpdGhvdXRVcGRhdGUoKSBjb25zdDsKIAotICAgIGJvb2wgaGFzQXR0cmlidXRl KGNvbnN0IFN0cmluZyYgbmFtZSkgY29uc3Q7Ci0gICAgYm9vbCBoYXNBdHRyaWJ1dGVOUyhjb25z dCBTdHJpbmcmIG5hbWVzcGFjZVVSSSwgY29uc3QgU3RyaW5nJiBsb2NhbE5hbWUpIGNvbnN0Owor ICAgIGJvb2wgaGFzQXR0cmlidXRlKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSkgY29uc3Q7Cisg ICAgYm9vbCBoYXNBdHRyaWJ1dGVOUyhjb25zdCBBdG9taWNTdHJpbmcmIG5hbWVzcGFjZVVSSSwg Y29uc3QgQXRvbWljU3RyaW5nJiBsb2NhbE5hbWUpIGNvbnN0OwogCiAgICAgY29uc3QgQXRvbWlj U3RyaW5nJiBnZXRBdHRyaWJ1dGUoY29uc3QgQXRvbWljU3RyaW5nJiBuYW1lKSBjb25zdDsKICAg ICBjb25zdCBBdG9taWNTdHJpbmcmIGdldEF0dHJpYnV0ZU5TKGNvbnN0IFN0cmluZyYgbmFtZXNw YWNlVVJJLCBjb25zdCBTdHJpbmcmIGxvY2FsTmFtZSkgY29uc3Q7Cg== 157086 2012-08-07 19:20:20 -0700 2012-08-08 01:43:38 -0700 patch for landing bug-90273-20120808111954.patch text/plain 3415 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0OTY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQzOTEyOTkwMTI3ZjIz ZGExOTFjMjEzOTBjN2UzNDc5MGVlMTc1Ny4uZTQ3MmZmMTdiOWVlOGM0ZmZjY2FmOTU5NDJjMmYz N2JjZDY4NDI1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDEyLTA4LTA3ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBPcHRpbWl6ZSBFbGVt ZW50OjpoYXNBdHRyaWJ1dGUoKSBieSByZXBsYWNpbmcgU3RyaW5nIHdpdGggQXRvbWljU3RyaW5n CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDI3Mwor CisgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCisKKyAgICAgICAgQmFzZWQgb24gdGhl IG9ic2VydmF0aW9uIGRlc2NyaWJlZCBpbiB0aGlzIENoYW5nZUxvZworICAgICAgICAoaHR0cDov L3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTIxNDM5KSwgdGhpcyBwYXRjaCBvcHRpbWl6ZXMg dGhlCisgICAgICAgIHBlcmZvcm1hbmNlIG9mIEVsZW1lbnQ6Omhhc0F0dHJpYnV0ZSgpIGJ5IHJl cGxhY2luZyBTdHJpbmcgd2l0aCBBdG9taWNTdHJpbmcuCisKKyAgICAgICAgUGVyZm9ybWFuY2Ug dGVzdDogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvYXR0YWNobWVudC5jZ2k/aWQ9MTUwMTQ0CisK KyAgICAgICAgaGFzQXR0cmlidXRlIChDaHJvbWl1bS9MaW51eCk6CisgICAgICAgIDMyOS42MG1z ID0+IDI1OS4wMG1zCisKKyAgICAgICAgaGFzQXR0cmlidXRlTlMgKENocm9taXVtL0xpbnV4KToK KyAgICAgICAgNTQ5LjYwbXMgPT4gNDM1LjgwbXMKKworICAgICAgICAqIGRvbS9FbGVtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6Omhhc0F0dHJpYnV0ZSk6CisgICAgICAgIChX ZWJDb3JlOjpFbGVtZW50OjpoYXNBdHRyaWJ1dGVOUyk6CisgICAgICAgICogZG9tL0VsZW1lbnQu aDoKKyAgICAgICAgKEVsZW1lbnQpOgorCisyMDEyLTA4LTA3ICBLZW50YXJvIEhhcmEgIDxoYXJh a2VuQGNocm9taXVtLm9yZz4KKwogICAgICAgICBbVjhdIFJlbW92ZSBhIGJ1bmNoIG9mIFBlcnNp c3RlbnQ6Ok5ldygpcyBvbiBzZXRKU1dyYXBwZXJGb3JYWFhPYmplY3QoKQogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTMzNDIKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1l bnQuY3BwCmluZGV4IDdiZTY0MGViMTI1MDFiMjViMmZlZGVjYTE1ZWI1NDczNzlkOGJmN2QuLmVh MjQzYjRjYzcyZjYzMmY1ZGU3ZDE5MmE0ZmIzMjAzYzI2NGUzMTAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVu dC5jcHAKQEAgLTE1MzIsMTggKzE1MzIsMTggQEAgUGFzc1JlZlB0cjxBdHRyPiBFbGVtZW50Ojpn ZXRBdHRyaWJ1dGVOb2RlTlMoY29uc3QgU3RyaW5nJiBuYW1lc3BhY2VVUkksIGNvbnN0IFMKICAg ICByZXR1cm4gYXR0cmlidXRlRGF0YS0+Z2V0QXR0cmlidXRlTm9kZShRdWFsaWZpZWROYW1lKG51 bGxBdG9tLCBsb2NhbE5hbWUsIG5hbWVzcGFjZVVSSSksIHRoaXMpOwogfQogCi1ib29sIEVsZW1l bnQ6Omhhc0F0dHJpYnV0ZShjb25zdCBTdHJpbmcmIG5hbWUpIGNvbnN0Citib29sIEVsZW1lbnQ6 Omhhc0F0dHJpYnV0ZShjb25zdCBBdG9taWNTdHJpbmcmIG5hbWUpIGNvbnN0CiB7CiAgICAgaWYg KCFhdHRyaWJ1dGVEYXRhKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIFRoaXMg Y2FsbCB0byBTdHJpbmc6Omxvd2VyKCkgc2VlbXMgdG8gYmUgcmVxdWlyZWQgYnV0CiAgICAgLy8g dGhlcmUgbWF5IGJlIGEgd2F5IHRvIHJlbW92ZSBpdC4KLSAgICBTdHJpbmcgbG9jYWxOYW1lID0g c2hvdWxkSWdub3JlQXR0cmlidXRlQ2FzZSh0aGlzKSA/IG5hbWUubG93ZXIoKSA6IG5hbWU7Cisg ICAgQXRvbWljU3RyaW5nIGxvY2FsTmFtZSA9IHNob3VsZElnbm9yZUF0dHJpYnV0ZUNhc2UodGhp cykgPyBuYW1lLmxvd2VyKCkgOiBuYW1lOwogICAgIHJldHVybiB1cGRhdGVkQXR0cmlidXRlRGF0 YSgpLT5nZXRBdHRyaWJ1dGVJdGVtKGxvY2FsTmFtZSwgZmFsc2UpOwogfQogCi1ib29sIEVsZW1l bnQ6Omhhc0F0dHJpYnV0ZU5TKGNvbnN0IFN0cmluZyYgbmFtZXNwYWNlVVJJLCBjb25zdCBTdHJp bmcmIGxvY2FsTmFtZSkgY29uc3QKK2Jvb2wgRWxlbWVudDo6aGFzQXR0cmlidXRlTlMoY29uc3Qg QXRvbWljU3RyaW5nJiBuYW1lc3BhY2VVUkksIGNvbnN0IEF0b21pY1N0cmluZyYgbG9jYWxOYW1l KSBjb25zdAogewogICAgIGNvbnN0IEVsZW1lbnRBdHRyaWJ1dGVEYXRhKiBhdHRyaWJ1dGVEYXRh ID0gdXBkYXRlZEF0dHJpYnV0ZURhdGEoKTsKICAgICBpZiAoIWF0dHJpYnV0ZURhdGEpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnQuaAppbmRleCA1OTkxZmVmNGUzMjczYTA0MzM0YTBjOWVlNjFhYTQxZTExYzIwODU4 Li42YWIzYmJjYThjNzU2ZjRmZDY4OWIwNzhjMjcxMjVlYWRjZGRmNGQ0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVt ZW50LmgKQEAgLTE0MSw4ICsxNDEsOCBAQCBwdWJsaWM6CiAgICAgLy8gaW4gc3R5bGUgYXR0cmli dXRlIG9yIG9uZSBvZiB0aGUgU1ZHIGFuaW1hdGlvbiBhdHRyaWJ1dGVzLgogICAgIGJvb2wgaGFz QXR0cmlidXRlc1dpdGhvdXRVcGRhdGUoKSBjb25zdDsKIAotICAgIGJvb2wgaGFzQXR0cmlidXRl KGNvbnN0IFN0cmluZyYgbmFtZSkgY29uc3Q7Ci0gICAgYm9vbCBoYXNBdHRyaWJ1dGVOUyhjb25z dCBTdHJpbmcmIG5hbWVzcGFjZVVSSSwgY29uc3QgU3RyaW5nJiBsb2NhbE5hbWUpIGNvbnN0Owor ICAgIGJvb2wgaGFzQXR0cmlidXRlKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSkgY29uc3Q7Cisg ICAgYm9vbCBoYXNBdHRyaWJ1dGVOUyhjb25zdCBBdG9taWNTdHJpbmcmIG5hbWVzcGFjZVVSSSwg Y29uc3QgQXRvbWljU3RyaW5nJiBsb2NhbE5hbWUpIGNvbnN0OwogCiAgICAgY29uc3QgQXRvbWlj U3RyaW5nJiBnZXRBdHRyaWJ1dGUoY29uc3QgQXRvbWljU3RyaW5nJiBuYW1lKSBjb25zdDsKICAg ICBjb25zdCBBdG9taWNTdHJpbmcmIGdldEF0dHJpYnV0ZU5TKGNvbnN0IEF0b21pY1N0cmluZyYg bmFtZXNwYWNlVVJJLCBjb25zdCBBdG9taWNTdHJpbmcmIGxvY2FsTmFtZSkgY29uc3Q7Cg==