109607 2013-02-12 13:12:32 -0800 Threaded HTML parser should pass the remaining fast/tokenizer tests 2013-02-12 14:46:07 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 106127 1 abarth abarth eric ojan.autocc tonyg webkit.review.bot oldest_to_newest 831183 0 abarth 2013-02-12 13:12:32 -0800 Threaded HTML parser should pass the remaining fast/tokenizer tests 831186 1 187917 abarth 2013-02-12 13:14:56 -0800 Created attachment 187917 Patch 831189 2 187917 eric 2013-02-12 13:17:48 -0800 Comment on attachment 187917 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187917&action=review I think we're gonna need to chat/vc about this one. > Source/WebCore/html/parser/HTMLDocumentParser.cpp:317 > + ASSERT(checkpoint->unparsedInput.isSafeToSendToAnotherThread()); Seems we should just call isSafeToSentToAnotherThread on checkpoint itself? 831195 3 abarth 2013-02-12 13:23:23 -0800 (In reply to comment #2) > (From update of attachment 187917 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=187917&action=review > > I think we're gonna need to chat/vc about this one. Ok. Let me know when you're ready. > > Source/WebCore/html/parser/HTMLDocumentParser.cpp:317 > > + ASSERT(checkpoint->unparsedInput.isSafeToSendToAnotherThread()); > > Seems we should just call isSafeToSentToAnotherThread on checkpoint itself? Sure, we could do that. 831201 4 187917 eric 2013-02-12 13:28:52 -0800 Comment on attachment 187917 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187917&action=review > Source/WebCore/html/parser/HTMLDocumentParser.cpp:251 > + ASSERT(!m_haveBackgroundParser || mode == ForceSynchronous); These scare me. We should just make sure both of these ASSERT changes are necessary. 831202 5 187917 eric 2013-02-12 13:32:24 -0800 Comment on attachment 187917 Patch LGTM. Please check the ASSERTS before landing. 831213 6 abarth 2013-02-12 13:41:52 -0800 We talked through the ASSERTs on VC. It's for the case when you have a script-created parser that document.writes something like "<script src=...></script>Foo". We'll parse the script tag synchronously but then wait for the external script to arrive. Once the external script arrives, we'll parse the "Foo" asynchronously. In that case, shouldUseBackgroundParser is true but we don't m_haveBackgroundParser. We discussed several approaches for cleaning up these state variables, and we'll rename or rework them to be clearer in a future patch. 831280 7 187917 webkit.review.bot 2013-02-12 14:46:04 -0800 Comment on attachment 187917 Patch Clearing flags on attachment: 187917 Committed r142673: <http://trac.webkit.org/changeset/142673> 831281 8 webkit.review.bot 2013-02-12 14:46:07 -0800 All reviewed patches have been landed. Closing bug. 187917 2013-02-12 13:14:56 -0800 2013-02-12 14:46:04 -0800 Patch bug-109607-20130212131126.patch text/plain 9011 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGU3MDk5Y2I4Y2ZmMTU3 NmNlNzIyNWUxMTU3NDY0ZmM5NmU2OTk4Mi4uNTI4ODgwNTEwNzNkYmI0NjA2ZTU5NGI0ZjFhMTMz MDc2NDMwZTc5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDEzLTAyLTEyICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKKyAgICAgICAgVGhyZWFkZWQgSFRNTCBwYXJz ZXIgc2hvdWxkIHBhc3MgdGhlIHJlbWFpbmluZyBmYXN0L3Rva2VuaXplciB0ZXN0cworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5NjA3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBmaXhl cyBzb21lIGVkZ2UgY2FzZXMgaW52b2x2aW5nIGRvY3VtZW50LndyaXRlLiBQcmV2aW91c2x5LAor ICAgICAgICB3ZSB3b3VsZCBkcm9wIGlucHV0IGNoYXJhY3RlcnMgb24gdGhlIGZsb29yIGlmIHRo ZSB0b2tlbml6ZXIgd2Fzbid0CisgICAgICAgIGFibGUgdG8gY29uc3VtZSB0aGVtIHN5bmNocm9u b3VzbHkuIEluIHRoaXMgcGF0Y2gsIHdlIHNlbmQgdGhlIHVucGFyc2VkCisgICAgICAgIGNoYXJh Y3RlcnMgdG8gdGhlIGJhY2tncm91bmQgdGhyZWFkIGZvciBjb25zdW1wdGlvbiBhZnRlciByZXdp bmRpbmcgdGhlCisgICAgICAgIGlucHV0IHN0cmVhbS4KKworICAgICAgICAqIGh0bWwvcGFyc2Vy L0JhY2tncm91bmRIVE1MSW5wdXRTdHJlYW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6QmFja2dy b3VuZEhUTUxJbnB1dFN0cmVhbTo6cmV3aW5kVG8pOgorICAgICAgICAqIGh0bWwvcGFyc2VyL0Jh Y2tncm91bmRIVE1MSW5wdXRTdHJlYW0uaDoKKyAgICAgICAgKEJhY2tncm91bmRIVE1MSW5wdXRT dHJlYW0pOgorICAgICAgICAqIGh0bWwvcGFyc2VyL0JhY2tncm91bmRIVE1MUGFyc2VyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkJhY2tncm91bmRIVE1MUGFyc2VyOjpyZXN1bWVGcm9tKToKKyAg ICAgICAgKiBodG1sL3BhcnNlci9CYWNrZ3JvdW5kSFRNTFBhcnNlci5oOgorICAgICAgICAoQ2hl Y2twb2ludCk6CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkhUTUxEb2N1bWVudFBhcnNlcjo6Y2FuVGFrZU5leHRUb2tlbik6 CisgICAgICAgIChXZWJDb3JlOjpIVE1MRG9jdW1lbnRQYXJzZXI6OmRpZEZhaWxTcGVjdWxhdGlv bik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRG9jdW1lbnRQYXJzZXI6OnB1bXBUb2tlbml6ZXIp OgorICAgICAgICAoV2ViQ29yZTo6SFRNTERvY3VtZW50UGFyc2VyOjpmaW5pc2gpOgorICAgICAg ICAqIGh0bWwvcGFyc2VyL0hUTUxJbnB1dFN0cmVhbS5oOgorICAgICAgICAoV2ViQ29yZTo6SFRN TElucHV0U3RyZWFtOjpjbG9zZVdpdGhvdXRNYXJraW5nRW5kT2ZGaWxlKToKKyAgICAgICAgKEhU TUxJbnB1dFN0cmVhbSk6CisKKzIwMTMtMDItMTIgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0 Lm9yZz4KKwogICAgICAgICBCYWNrZ3JvdW5kSFRNTFBhcnNlcjo6cmVzdW1lRnJvbSBzaG91bGQg dGFrZSBhIHN0cnVjdAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTA5NTk4CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0Jh Y2tncm91bmRIVE1MSW5wdXRTdHJlYW0uY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIv QmFja2dyb3VuZEhUTUxJbnB1dFN0cmVhbS5jcHAKaW5kZXggYjgyMjNkM2M5YTZjMjY2NjY2NzU2 YjZiYzhjM2U4NDcwZGVmZjgzNi4uMDNmNDNkZDFmNTRiMzEyNmRjNTdmYmI2MGM5YTdjODc3YmYz ZmEzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQmFja2dyb3VuZEhU TUxJbnB1dFN0cmVhbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQmFja2dy b3VuZEhUTUxJbnB1dFN0cmVhbS5jcHAKQEAgLTUzLDE4ICs1MywyOCBAQCBIVE1MSW5wdXRDaGVj a3BvaW50IEJhY2tncm91bmRIVE1MSW5wdXRTdHJlYW06OmNyZWF0ZUNoZWNrcG9pbnQoKQogICAg IHJldHVybiBjaGVja3BvaW50OwogfQogCi12b2lkIEJhY2tncm91bmRIVE1MSW5wdXRTdHJlYW06 OnJld2luZFRvKEhUTUxJbnB1dENoZWNrcG9pbnQgY2hlY2twb2ludEluZGV4KQordm9pZCBCYWNr Z3JvdW5kSFRNTElucHV0U3RyZWFtOjpyZXdpbmRUbyhIVE1MSW5wdXRDaGVja3BvaW50IGNoZWNr cG9pbnRJbmRleCwgY29uc3QgU3RyaW5nJiB1bnBhcnNlZElucHV0KQogeworICAgIEFTU0VSVChj aGVja3BvaW50SW5kZXggPCBtX2NoZWNrcG9pbnRzLnNpemUoKSk7IC8vIElmIHRoaXMgQVNTRVJU IGZpcmVzLCBjaGVja3BvaW50SW5kZXggaXMgaW52YWxpZC4KICAgICBjb25zdCBDaGVja3BvaW50 JiBjaGVja3BvaW50ID0gbV9jaGVja3BvaW50c1tjaGVja3BvaW50SW5kZXhdOwogCiAgICAgYm9v bCBpc0Nsb3NlZCA9IG1fY3VycmVudC5pc0Nsb3NlZCgpOwogCiAgICAgbV9jdXJyZW50ID0gY2hl Y2twb2ludC5pbnB1dDsKKwogICAgIGZvciAoc2l6ZV90IGkgPSBjaGVja3BvaW50Lm51bWJlck9m U2VnbWVudHNBbHJlYWR5QXBwZW5kZWQ7IGkgPCBtX3NlZ21lbnRzLnNpemUoKTsgKytpKQogICAg ICAgICBtX2N1cnJlbnQuYXBwZW5kKFNlZ21lbnRlZFN0cmluZyhtX3NlZ21lbnRzW2ldKSk7CiAK KyAgICBpZiAoIXVucGFyc2VkSW5wdXQuaXNFbXB0eSgpKQorICAgICAgICBtX2N1cnJlbnQucHJl cGVuZChTZWdtZW50ZWRTdHJpbmcodW5wYXJzZWRJbnB1dCkpOworCiAgICAgaWYgKGlzQ2xvc2Vk ICYmICFtX2N1cnJlbnQuaXNDbG9zZWQoKSkKICAgICAgICAgbV9jdXJyZW50LmNsb3NlKCk7CisK KyAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGJlIGFibGUgdG8gYWN0aXZlbHkgaW52YWxpZGF0ZSBh bGwgdGhlIG91dHN0YW5kaW5nIGNoZWNrcG9pbnRzCisgICAgLy8gYnkgY2xlYXJpbmcgbV9zZWdt ZW50cyBhbmQgbV9jaGVja3BvaW50cywgYnV0IHRoYXQgY2F1c2VzCisgICAgLy8gZmFzdC90b2tl bml6ZXIvd3JpdGUtYmVmb3JlLWxvYWQuaHRtbCB0byBoaXQgdGhlIEFTU0VSVCBhdCB0aGUgYmVn aW5uaW5nIG9mCisgICAgLy8gdGhpcyBmdW5jdGlvbi4KIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQmFja2dyb3VuZEhUTUxJbnB1dFN0cmVhbS5oIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQmFja2dyb3VuZEhUTUxJbnB1dFN0cmVhbS5oCmluZGV4 IGM0NWU2ZDIyODRkZTdkMzUxMmM2YTA1Njc3Nzk0YjI0OTk0YjM4NmEuLmM3MGIwNzJjZDU0MGFl MDlhNjY1NDQ3YmRlMTY1NzI0MjdkMzMyZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0JhY2tncm91bmRIVE1MSW5wdXRTdHJlYW0uaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3BhcnNlci9CYWNrZ3JvdW5kSFRNTElucHV0U3RyZWFtLmgKQEAgLTQ2LDggKzQ2LDEw IEBAIHB1YmxpYzoKIAogICAgIFNlZ21lbnRlZFN0cmluZyYgY3VycmVudCgpIHsgcmV0dXJuIG1f Y3VycmVudDsgfQogCisgICAgLy8gQW4gSFRNTElucHV0Q2hlY2twb2ludCBpcyB2YWxpZCB1bnRp bCB0aGUgbmV4dCBjYWxsIHRvIHJld2luZFRvLCBhdCB3aGljaAorICAgIC8vIHBvaW50IGFsbCBv dXRzdGFuZGluZyBjaGVja3BvaW50cyBhcmUgaW52YWxpZGF0ZWQuCiAgICAgSFRNTElucHV0Q2hl Y2twb2ludCBjcmVhdGVDaGVja3BvaW50KCk7Ci0gICAgdm9pZCByZXdpbmRUbyhIVE1MSW5wdXRD aGVja3BvaW50KTsKKyAgICB2b2lkIHJld2luZFRvKEhUTUxJbnB1dENoZWNrcG9pbnQsIGNvbnN0 IFN0cmluZyYgdW5wYXJzZWRJbnB1dCk7CiAKIHByaXZhdGU6CiAgICAgc3RydWN0IENoZWNrcG9p bnQgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQmFja2dyb3VuZEhU TUxQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQmFja2dyb3VuZEhUTUxQ YXJzZXIuY3BwCmluZGV4IDU5YWJmZTBhNWQ1Y2UxYWM1MGU4NzUyZmNmN2NmN2YyMjRjZTYwMGQu LmViM2YzODYyNGYyMzk5MjI0ZTY0ZjRkZDk3YWU5NTQyMjUxODlkNTggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0JhY2tncm91bmRIVE1MUGFyc2VyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9CYWNrZ3JvdW5kSFRNTFBhcnNlci5jcHAKQEAgLTgx LDcgKzgxLDcgQEAgdm9pZCBCYWNrZ3JvdW5kSFRNTFBhcnNlcjo6cmVzdW1lRnJvbShQYXNzT3du UHRyPENoZWNrcG9pbnQ+IGNoZWNrcG9pbnQpCiAgICAgbV9wYXJzZXIgPSBjaGVja3BvaW50LT5w YXJzZXI7CiAgICAgbV90b2tlbiA9IGNoZWNrcG9pbnQtPnRva2VuLnJlbGVhc2UoKTsKICAgICBt X3Rva2VuaXplciA9IGNoZWNrcG9pbnQtPnRva2VuaXplci5yZWxlYXNlKCk7Ci0gICAgbV9pbnB1 dC5yZXdpbmRUbyhjaGVja3BvaW50LT5pbnB1dENoZWNrcG9pbnQpOworICAgIG1faW5wdXQucmV3 aW5kVG8oY2hlY2twb2ludC0+aW5wdXRDaGVja3BvaW50LCBjaGVja3BvaW50LT51bnBhcnNlZElu cHV0KTsKICAgICBwdW1wVG9rZW5pemVyKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvcGFyc2VyL0JhY2tncm91bmRIVE1MUGFyc2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL3BhcnNlci9CYWNrZ3JvdW5kSFRNTFBhcnNlci5oCmluZGV4IDdhMTg0ZjBiMzNmZTM4NzNi OTIxMzAwYzgxNjE3ODJjODE1OWM1YTQuLjRmMTUxYTk2NDUwNjc4MTA1ZTEzOWEwM2Q4MWI2NGUx MmVjNzlmNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0JhY2tncm91 bmRIVE1MUGFyc2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQmFja2dyb3Vu ZEhUTUxQYXJzZXIuaApAQCAtNTgsNiArNTgsNyBAQCBwdWJsaWM6CiAgICAgICAgIE93blB0cjxI VE1MVG9rZW4+IHRva2VuOwogICAgICAgICBPd25QdHI8SFRNTFRva2VuaXplcj4gdG9rZW5pemVy OwogICAgICAgICBIVE1MSW5wdXRDaGVja3BvaW50IGlucHV0Q2hlY2twb2ludDsKKyAgICAgICAg U3RyaW5nIHVucGFyc2VkSW5wdXQ7CiAgICAgfTsKIAogICAgIHZvaWQgYXBwZW5kKGNvbnN0IFN0 cmluZyYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3Vt ZW50UGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBh cnNlci5jcHAKaW5kZXggYzgyN2QxMjU4OGM1YzE2NWU2MWM4YTljOTQ0MWNiYzE2ZjhhZmU4NC4u Yzk4ZDI5MTBiYTNmMTQ2N2YxNTVhN2M5OTY2ODhhMzEyNGNhZjcxMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwCkBAIC0yNDgsNyAr MjQ4LDcgQEAgYm9vbCBIVE1MRG9jdW1lbnRQYXJzZXI6OmNhblRha2VOZXh0VG9rZW4oU3luY2hy b25vdXNNb2RlIG1vZGUsIFB1bXBTZXNzaW9uJiBzZXMKICAgICBpZiAoaXNTdG9wcGVkKCkpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIEFTU0VSVCghc2hvdWxkVXNlVGhyZWFkaW5nKCkg fHwgbW9kZSA9PSBGb3JjZVN5bmNocm9ub3VzKTsKKyAgICBBU1NFUlQoIW1faGF2ZUJhY2tncm91 bmRQYXJzZXIgfHwgbW9kZSA9PSBGb3JjZVN5bmNocm9ub3VzKTsKIAogICAgIGlmIChpc1dhaXRp bmdGb3JTY3JpcHRzKCkpIHsKICAgICAgICAgaWYgKG1vZGUgPT0gQWxsb3dZaWVsZCkKQEAgLTMx MSw3ICszMTEsMTAgQEAgdm9pZCBIVE1MRG9jdW1lbnRQYXJzZXI6OmRpZEZhaWxTcGVjdWxhdGlv bihQYXNzT3duUHRyPEhUTUxUb2tlbj4gdG9rZW4sIFBhc3NPd24KICAgICBjaGVja3BvaW50LT50 b2tlbiA9IHRva2VuOwogICAgIGNoZWNrcG9pbnQtPnRva2VuaXplciA9IHRva2VuaXplcjsKICAg ICBjaGVja3BvaW50LT5pbnB1dENoZWNrcG9pbnQgPSBtX2N1cnJlbnRDaHVuay0+Y2hlY2twb2lu dDsKKyAgICBjaGVja3BvaW50LT51bnBhcnNlZElucHV0ID0gbV9pbnB1dC5jdXJyZW50KCkudG9T dHJpbmcoKS5pc29sYXRlZENvcHkoKTsKKyAgICBtX2lucHV0LmN1cnJlbnQoKS5jbGVhcigpOwog CisgICAgQVNTRVJUKGNoZWNrcG9pbnQtPnVucGFyc2VkSW5wdXQuaXNTYWZlVG9TZW5kVG9Bbm90 aGVyVGhyZWFkKCkpOwogICAgIEhUTUxQYXJzZXJUaHJlYWQ6OnNoYXJlZCgpLT5wb3N0VGFzayhi aW5kKCZCYWNrZ3JvdW5kSFRNTFBhcnNlcjo6cmVzdW1lRnJvbSwgbV9iYWNrZ3JvdW5kUGFyc2Vy LCBjaGVja3BvaW50LnJlbGVhc2UoKSkpOwogfQogCkBAIC0zOTksNyArNDAyLDcgQEAgdm9pZCBI VE1MRG9jdW1lbnRQYXJzZXI6OnB1bXBUb2tlbml6ZXIoU3luY2hyb25vdXNNb2RlIG1vZGUpCiAg ICAgQVNTRVJUKHJlZkNvdW50KCkgPj0gMik7CiAgICAgQVNTRVJUKG1fdG9rZW5pemVyKTsKICAg ICBBU1NFUlQobV90b2tlbik7Ci0gICAgQVNTRVJUKCFzaG91bGRVc2VUaHJlYWRpbmcoKSB8fCBt b2RlID09IEZvcmNlU3luY2hyb25vdXMpOworICAgIEFTU0VSVCghbV9oYXZlQmFja2dyb3VuZFBh cnNlciB8fCBtb2RlID09IEZvcmNlU3luY2hyb25vdXMpOwogCiAgICAgUHVtcFNlc3Npb24gc2Vz c2lvbihtX3B1bXBTZXNzaW9uTmVzdGluZ0xldmVsLCBjb250ZXh0Rm9yUGFyc2luZ1Nlc3Npb24o KSk7CiAKQEAgLTY3MCwyMCArNjczLDE3IEBAIHZvaWQgSFRNTERvY3VtZW50UGFyc2VyOjpmaW5p c2goKQogICAgIC8vIG1ha2VzIHNlbnNlIHRvIGNhbGwgYW55IG1ldGhvZHMgb24gRG9jdW1lbnRQ YXJzZXIgb25jZSBpdCdzIGJlZW4gc3RvcHBlZC4KICAgICAvLyBIb3dldmVyLCBGcmFtZUxvYWRl cjo6c3RvcCBjYWxscyBEb2N1bWVudFBhcnNlcjo6ZmluaXNoIHVuY29uZGl0aW9uYWxseS4KIAot ICAgIC8vIFdlJ3JlIG5vdCBnb2luZyB0byBnZXQgYW55IG1vcmUgZGF0YSBvZmYgdGhlIG5ldHdv cmssIHNvIHdlIHRlbGwgdGhlCi0gICAgLy8gaW5wdXQgc3RyZWFtIHdlJ3ZlIHJlYWNoZWQgdGhl IGVuZCBvZiBmaWxlLiBmaW5pc2goKSBjYW4gYmUgY2FsbGVkIG1vcmUKLSAgICAvLyB0aGFuIG9u Y2UsIGlmIHRoZSBmaXJzdCB0aW1lIGRvZXMgbm90IGNhbGwgZW5kKCkuCi0gICAgaWYgKCFtX2lu cHV0LmhhdmVTZWVuRW5kT2ZGaWxlKCkpCi0gICAgICAgIG1faW5wdXQubWFya0VuZE9mRmlsZSgp OwotCiAjaWYgRU5BQkxFKFRIUkVBREVEX0hUTUxfUEFSU0VSKQogICAgIC8vIEVtcHR5IGRvY3Vt ZW50cyBuZXZlciBnb3QgYW4gYXBwZW5kKCkgY2FsbCwgYW5kIHRodXMgaGF2ZSBuZXZlciBzdGFy dGVkCiAgICAgLy8gYSBiYWNrZ3JvdW5kIHBhcnNlci4gSW4gdGhvc2UgY2FzZXMsIHdlIGlnbm9y ZSBzaG91bGRVc2VUaHJlYWRpbmcoKQogICAgIC8vIGFuZCBmYWxsIHRocm91Z2ggdG8gdGhlIG5v bi10aHJlYWRpbmcgY2FzZS4KICAgICBpZiAobV9oYXZlQmFja2dyb3VuZFBhcnNlcikgeworICAg ICAgICBpZiAoIW1faW5wdXQuaGF2ZVNlZW5FbmRPZkZpbGUoKSkKKyAgICAgICAgICAgIG1faW5w dXQuY2xvc2VXaXRob3V0TWFya2luZ0VuZE9mRmlsZSgpOwogICAgICAgICBIVE1MUGFyc2VyVGhy ZWFkOjpzaGFyZWQoKS0+cG9zdFRhc2soYmluZCgmQmFja2dyb3VuZEhUTUxQYXJzZXI6OmZpbmlz aCwgbV9iYWNrZ3JvdW5kUGFyc2VyKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CisKICAgICBp ZiAoc2hvdWxkVXNlVGhyZWFkaW5nKCkgJiYgIXdhc0NyZWF0ZWRCeVNjcmlwdCgpKSB7CiAgICAg ICAgIEFTU0VSVCghbV90b2tlbml6ZXIgJiYgIW1fdG9rZW4pOwogICAgICAgICAvLyBXZSdyZSBm aW5pc2hpbmcgYmVmb3JlIHJlY2VpdmluZyBhbnkgZGF0YS4gUmF0aGVyIHRoYW4gYm9vdGluZyB1 cApAQCAtNjk0LDYgKzY5NCwxMiBAQCB2b2lkIEhUTUxEb2N1bWVudFBhcnNlcjo6ZmluaXNoKCkK ICAgICB9CiAjZW5kaWYKIAorICAgIC8vIFdlJ3JlIG5vdCBnb2luZyB0byBnZXQgYW55IG1vcmUg ZGF0YSBvZmYgdGhlIG5ldHdvcmssIHNvIHdlIHRlbGwgdGhlCisgICAgLy8gaW5wdXQgc3RyZWFt IHdlJ3ZlIHJlYWNoZWQgdGhlIGVuZCBvZiBmaWxlLiBmaW5pc2goKSBjYW4gYmUgY2FsbGVkIG1v cmUKKyAgICAvLyB0aGFuIG9uY2UsIGlmIHRoZSBmaXJzdCB0aW1lIGRvZXMgbm90IGNhbGwgZW5k KCkuCisgICAgaWYgKCFtX2lucHV0LmhhdmVTZWVuRW5kT2ZGaWxlKCkpCisgICAgICAgIG1faW5w dXQubWFya0VuZE9mRmlsZSgpOworCiAgICAgYXR0ZW1wdFRvRW5kKCk7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxJbnB1dFN0cmVhbS5oIGIvU291cmNl L1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTElucHV0U3RyZWFtLmgKaW5kZXggNDZmZDhjNDM4NzRk MDdmNjk4MGRiZDIxN2ViMjdlNThjYmQ5MGFmYy4uYTdiODZiM2JhZmYwZjFmNTUwZWJhOGFkYjJh ZDRjZDdjM2ZhZDM1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRN TElucHV0U3RyZWFtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTElucHV0 U3RyZWFtLmgKQEAgLTc3LDYgKzc3LDExIEBAIHB1YmxpYzoKICAgICAgICAgbV9sYXN0LT5jbG9z ZSgpOwogICAgIH0KIAorICAgIHZvaWQgY2xvc2VXaXRob3V0TWFya2luZ0VuZE9mRmlsZSgpCisg ICAgeworICAgICAgICBtX2xhc3QtPmNsb3NlKCk7CisgICAgfQorCiAgICAgYm9vbCBoYXZlU2Vl bkVuZE9mRmlsZSgpIGNvbnN0CiAgICAgewogICAgICAgICByZXR1cm4gbV9sYXN0LT5pc0Nsb3Nl ZCgpOwo=