42233 2010-07-13 22:24:56 -0700 HTMLTreeBuilder needs to update to match new spec behavior for <button> 2010-07-21 18:01:01 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41123 1 eric abarth abarth commit-queue oldest_to_newest 250963 0 eric 2010-07-13 22:24:56 -0700 Minefields "<a>1<button>2</a>3</button>" behavior is wrong, update results 250967 1 eric 2010-07-13 22:28:50 -0700 Actually, I now realize that the LegacyHTMLTreeBuilder matches minefield's behavior. Maybe I read the HTML5 spec wrong? I've filed a bug with Mozilla: https://bugzilla.mozilla.org/show_bug.cgi?id=578568 250968 2 eric 2010-07-13 22:32:04 -0700 I'm still pretty certain that Minefield's behavior violates HTML5. As far as I can tell, when you hit the </a> the adoption agency algorithm does not run because of: "If there is no such node, or, if that node is also in the stack of open elements but the element is not in scope, then this is a parse error; ignore the token, and abort these steps." There is an <a> in the open elements, but its not in scope, because <button> is a scope marker. So the </a> is just ignored, and the 3 ends up inside <button> and is coalesced. 250969 3 eric 2010-07-13 22:33:04 -0700 Ahha. The spec has changed: http://www.w3.org/Bugs/Public/show_bug.cgi?id=9496 250970 4 eric 2010-07-13 22:34:14 -0700 See also: http://www.w3.org/Bugs/Public/show_bug.cgi?id=9829 250981 5 eric 2010-07-13 22:50:01 -0700 We need to implement this diff: http://html5.org/tools/web-apps-tracker?from=5031&to=5032 254530 6 62232 abarth 2010-07-21 14:47:33 -0700 Created attachment 62232 Patch 254556 7 62232 eric 2010-07-21 15:46:33 -0700 Comment on attachment 62232 Patch There was discussion between Henri and Ian just today about rolling out this spec change, making me wary of trying to do anything here yet. 254563 8 abarth 2010-07-21 15:55:31 -0700 I think we should track the spec. If the spec changes again, we can change the code again too. 254600 9 62232 eric 2010-07-21 17:31:02 -0700 Comment on attachment 62232 Patch OK. There was talk of reverting this change in the spec... but we can always revert this revision too. Sigh. 254610 10 62232 abarth 2010-07-21 18:00:54 -0700 Comment on attachment 62232 Patch Clearing flags on attachment: 62232 Committed r63868: <http://trac.webkit.org/changeset/63868> 254611 11 abarth 2010-07-21 18:01:01 -0700 All reviewed patches have been landed. Closing bug. 62232 2010-07-21 14:47:33 -0700 2010-07-21 18:00:54 -0700 Patch bug-42233-20100721144731.patch text/plain 11686 abarth ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzNGE3MjcxYmFjZTQ3MWQzMGI4ZThkOGYxOWEyN2ZkZDYzYjYzMDIyLi5hMjBkYjVl M2QyODdmMTZiNzI5NzlhYWRlNWUwNjdjNTg2MWU5NmM3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAK IDIwMTAtMDctMjEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAorICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBIVE1MVHJlZUJ1aWxkZXIgbmVl ZHMgdG8gdXBkYXRlIHRvIG1hdGNoIG5ldyBzcGVjIGJlaGF2aW9yIGZvciA8YnV0dG9uPgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDIyMzMKKworICAg ICAgICBUZXN0IHByb2dyZXNzaW9uLiAgVGhlcmUncyBvbmUgcmVncmVzc2lvbiBtaXhlZCBpbiBo ZXJlLiAgSSdsbAorICAgICAgICBpbnZlc3RpZ2F0ZSBpbiB0aGUgbmV4dCBwYXRjaC4KKworICAg ICAgICAqIGh0bWw1bGliL3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQ6CisKKzIwMTAtMDctMjEg IEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBF cmljIFNlaWRlbC4KIAogICAgICAgICBQdWxsIEhUTUw1bGliIHRlc3Qgc3VpdGUgZnJvbSB1cHN0 cmVhbQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHRtbDVsaWIvcnVubmVyLWV4cGVjdGVkLWh0 bWw1LnR4dCBiL0xheW91dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQK aW5kZXggZDllYjVmMjRmYmFkYmM4NmQwODY2ODdkMjAyMjk0YzEwMmU4OTQyZi4uZjAxMDIzNGIx YzZlODM1MmRmMzIyMGVhZjY2MzQyMjA0Yjg0YmZiOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv aHRtbDVsaWIvcnVubmVyLWV4cGVjdGVkLWh0bWw1LnR4dAorKysgYi9MYXlvdXRUZXN0cy9odG1s NWxpYi9ydW5uZXItZXhwZWN0ZWQtaHRtbDUudHh0CkBAIC0xMCw0NCArMTAsOCBAQCBDT05TT0xF IE1FU1NBR0U6IGxpbmUgMTogU3ludGF4RXJyb3I6IFBhcnNlIGVycm9yCiBDT05TT0xFIE1FU1NB R0U6IGxpbmUgMjogUEFTUwogQ09OU09MRSBNRVNTQUdFOiBsaW5lIDI6IEZPTzxzcGFuPkJBUjwv c3Bhbj5CQVoKIENvbnRlbnQtVHlwZTogdGV4dC9wbGFpbgotcmVzb3VyY2VzL3Rlc3RzMS5kYXQ6 Ci0yNAotOTgKLQotVGVzdCAyNCBvZiAxMTQgaW4gcmVzb3VyY2VzL3Rlc3RzMS5kYXQgZmFpbGVk LiBJbnB1dDoKLTxiPjxidXR0b24+Zm9vPC9iPmJhcgotR290OgotfCA8aHRtbD4KLXwgICA8aGVh ZD4KLXwgICA8Ym9keT4KLXwgICAgIDxiPgotfCAgICAgICA8YnV0dG9uPgotfCAgICAgICAgICJm b29iYXIiCi1FeHBlY3RlZDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAg ICA8Yj4KLXwgICAgIDxidXR0b24+Ci18ICAgICAgIDxiPgotfCAgICAgICAgICJmb28iCi18ICAg ICAgICJiYXIiCityZXNvdXJjZXMvdGVzdHMxLmRhdDogUEFTUwogCi1UZXN0IDk4IG9mIDExNCBp biByZXNvdXJjZXMvdGVzdHMxLmRhdCBmYWlsZWQuIElucHV0OgotPGI+PGJ1dHRvbj48L2I+PC9i dXR0b24+PC9iPgotR290OgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAg IDxiPgotfCAgICAgICA8YnV0dG9uPgotRXhwZWN0ZWQ6Ci18IDxodG1sPgotfCAgIDxoZWFkPgot fCAgIDxib2R5PgotfCAgICAgPGI+Ci18ICAgICA8YnV0dG9uPgotfCAgICAgICA8Yj4KIHJlc291 cmNlcy90ZXN0czIuZGF0OiBQQVNTCiAKIHJlc291cmNlcy90ZXN0czMuZGF0OiBQQVNTCkBAIC00 NjcsNDggKzQzMSwyOSBAQCBFeHBlY3RlZDoKIHwgICAgICAgPGFydGljbGU+CiB8ICAgICAiYSIK IHJlc291cmNlcy90ZXN0czIwLmRhdDoKLTIwCi0yMQorMTYKIDI0CiAyNQogCi1UZXN0IDIwIG9m IDI1IGluIHJlc291cmNlcy90ZXN0czIwLmRhdCBmYWlsZWQuIElucHV0OgotPCFkb2N0eXBlIGh0 bWw+PGFkZHJlc3M+PGJ1dHRvbj48L2FkZHJlc3M+YQorVGVzdCAxNiBvZiAyNSBpbiByZXNvdXJj ZXMvdGVzdHMyMC5kYXQgZmFpbGVkLiBJbnB1dDoKKzwhZG9jdHlwZSBodG1sPjxwPjxidXR0b24+ PHRhYmxlPgogR290OgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+CiB8ICAgPGhlYWQ+CiB8 ICAgPGJvZHk+Ci18ICAgICA8YWRkcmVzcz4KLXwgICAgICAgPGJ1dHRvbj4KLXwgICAgICAgICAi YSIKLUV4cGVjdGVkOgotfCA8IURPQ1RZUEUgaHRtbD4KLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18 ICAgPGJvZHk+Ci18ICAgICA8YWRkcmVzcz4KLXwgICAgICAgPGJ1dHRvbj4KLXwgICAgICJhIgot Ci1UZXN0IDIxIG9mIDI1IGluIHJlc291cmNlcy90ZXN0czIwLmRhdCBmYWlsZWQuIElucHV0Ogot PCFkb2N0eXBlIGh0bWw+PGFkZHJlc3M+PGJ1dHRvbj48L2FkZHJlc3M+YQotR290OgotfCA8IURP Q1RZUEUgaHRtbD4KLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8YWRk cmVzcz4KK3wgICAgIDxwPgogfCAgICAgICA8YnV0dG9uPgotfCAgICAgICAgICJhIgorfCAgICAg ICAgIDxwPgorfCAgICAgICAgIDx0YWJsZT4KIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRtbD4K IHwgPGh0bWw+CiB8ICAgPGhlYWQ+CiB8ICAgPGJvZHk+Ci18ICAgICA8YWRkcmVzcz4KK3wgICAg IDxwPgogfCAgICAgICA8YnV0dG9uPgotfCAgICAgImEiCit8ICAgICAgICAgPHRhYmxlPgogCiBU ZXN0IDI0IG9mIDI1IGluIHJlc291cmNlcy90ZXN0czIwLmRhdCBmYWlsZWQuIElucHV0OgogPCFk b2N0eXBlIGh0bWw+PHA+PGZpZ2NhcHRpb24+CkBAIC04ODgsMzAgKzgzMyw4IEBAIHJlc291cmNl cy9lbnRpdGllczAyLmRhdDogUEFTUwogcmVzb3VyY2VzL2NvbW1lbnRzMDEuZGF0OiBQQVNTCiAK IHJlc291cmNlcy9hZG9wdGlvbjAxLmRhdDoKLTMKIDEyCiAKLVRlc3QgMyBvZiAxMiBpbiByZXNv dXJjZXMvYWRvcHRpb24wMS5kYXQgZmFpbGVkLiBJbnB1dDoKLTxhPjE8YnV0dG9uPjI8L2E+Mzwv YnV0dG9uPgotR290OgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxh PgotfCAgICAgICAiMSIKLXwgICAgICAgPGJ1dHRvbj4KLXwgICAgICAgICAiMjMiCi1FeHBlY3Rl ZDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8YT4KLXwgICAgICAg IjEiCi18ICAgICA8YnV0dG9uPgotfCAgICAgICA8YT4KLXwgICAgICAgICAiMiIKLXwgICAgICAg IjMiCi0KIFRlc3QgMTIgb2YgMTIgaW4gcmVzb3VyY2VzL2Fkb3B0aW9uMDEuZGF0IGZhaWxlZC4g SW5wdXQ6CiA8dGFibGU+QTx0ZD5CPC90ZD5DPC90YWJsZT4KIEdvdDoKZGlmZiAtLWdpdCBhL1dl YkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDYzZjJlNDVhNjllZjBm NmQ2ZTU2NWIyYjgzMjkzODAxOGRhZWQxNi4uZGI1NzU4YTIyODJiODI1MmUxMWYwYmU0MDlkMzI1 OTk0ZDU4Yzg0YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9D aGFuZ2VMb2cKQEAgLTIsNiArMiwyOCBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgogCisgICAgICAgIEhUTUxUcmVlQnVpbGRlciBuZWVkcyB0byB1cGRhdGUgdG8gbWF0 Y2ggbmV3IHNwZWMgYmVoYXZpb3IgZm9yIDxidXR0b24+CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjIzMworCisgICAgICAgIFRoZSBzcGVjIGhhcyBz b21lIHR5cG9zIGluIHRoaXMgYXJlYSwgYnV0IHRoaXMgaXMgbXkgYmVzdCBndWVzcyBmb3IKKyAg ICAgICAgd2hhdCBJYW4gbWVhbnMuICBJJ3ZlIGZpbGVkIGJ1Z3MgYWdhaW5zdCB0aGUgc3BlYyBm b3IgZWFjaCB0eXBvLgorCisgICAgICAgICogaHRtbC9IVE1MRWxlbWVudFN0YWNrLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxOYW1lczo6aXNTY29wZU1hcmtlcik6CisgICAgICAgIChXZWJD b3JlOjpIVE1MTmFtZXM6OmlzQnV0dG9uU2NvcGVNYXJrZXIpOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTEVsZW1lbnRTdGFjazo6aW5CdXR0b25TY29wZSk6CisgICAgICAgICogaHRtbC9IVE1MRWxl bWVudFN0YWNrLmg6CisgICAgICAgICogaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRmFrZVBFbmRUYWdJZlBJbkJ1dHRv blNjb3BlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0Nsb3Nl V2hlbk5lc3RlZFRhZyk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nl c3NTdGFydFRhZ0ZvckluQm9keSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6 OnByb2Nlc3NFbmRUYWdGb3JJbkJvZHkpOgorICAgICAgICAqIGh0bWwvSFRNTFRyZWVCdWlsZGVy Lmg6CisKKzIwMTAtMDctMjEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBGaXggdGhlIGxhc3Qg dHJlZSBIVE1MNSB0cmVlIGJ1aWxkZXIgY3Jhc2hlcwogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDI3NzMKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1s L0hUTUxFbGVtZW50U3RhY2suY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50U3RhY2suY3Bw CmluZGV4IDVjMzI1ZTU3MmRlNDMzMDg4YzhkMjc1NzM1MDY4OTM0NmI5MjJiZWYuLmYzZTc4ZjUw YmU5MGJmNWFjOTc1YTAyNTg0YjdiYzdmNDE3ZjU1YTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRt bC9IVE1MRWxlbWVudFN0YWNrLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnRTdGFj ay5jcHAKQEAgLTQzLDcgKzQzLDYgQEAgbmFtZXNwYWNlIHsKIGlubGluZSBib29sIGlzU2NvcGVN YXJrZXIoRWxlbWVudCogZWxlbWVudCkKIHsKICAgICByZXR1cm4gZWxlbWVudC0+aGFzVGFnTmFt ZShhcHBsZXRUYWcpCi0gICAgICAgIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUoYnV0dG9uVGFnKQog ICAgICAgICB8fCBlbGVtZW50LT5oYXNUYWdOYW1lKGNhcHRpb25UYWcpCiAjaWYgRU5BQkxFKFNW R19GT1JFSUdOX09CSkVDVCkKICAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFnTmFtZShTVkdOYW1l czo6Zm9yZWlnbk9iamVjdFRhZykKQEAgLTgzLDYgKzgyLDEyIEBAIGlubGluZSBib29sIGlzVGFi bGVSb3dTY29wZU1hcmtlcihFbGVtZW50KiBlbGVtZW50KQogICAgICAgICB8fCBlbGVtZW50LT5o YXNUYWdOYW1lKGh0bWxUYWcpOwogfQogCitpbmxpbmUgYm9vbCBpc0J1dHRvblNjb3BlTWFya2Vy KEVsZW1lbnQqIGVsZW1lbnQpCit7CisgICAgcmV0dXJuIGlzU2NvcGVNYXJrZXIoZWxlbWVudCkK KyAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFnTmFtZShidXR0b25UYWcpOworfQorCiB9CiAKIEhU TUxFbGVtZW50U3RhY2s6OkVsZW1lbnRSZWNvcmQ6OkVsZW1lbnRSZWNvcmQoUGFzc1JlZlB0cjxF bGVtZW50PiBlbGVtZW50LCBQYXNzT3duUHRyPEVsZW1lbnRSZWNvcmQ+IG5leHQpCkBAIC00MTQs NiArNDE5LDE3IEBAIGJvb2wgSFRNTEVsZW1lbnRTdGFjazo6aW5UYWJsZVNjb3BlKGNvbnN0IFF1 YWxpZmllZE5hbWUmIHRhZ05hbWUpIGNvbnN0CiAgICAgcmV0dXJuIGluVGFibGVTY29wZSh0YWdO YW1lLmxvY2FsTmFtZSgpKTsKIH0KIAorYm9vbCBIVE1MRWxlbWVudFN0YWNrOjppbkJ1dHRvblNj b3BlKGNvbnN0IEF0b21pY1N0cmluZyYgdGFyZ2V0VGFnKSBjb25zdAoreworICAgIHJldHVybiBp blNjb3BlQ29tbW9uPGlzQnV0dG9uU2NvcGVNYXJrZXI+KG1fdG9wLmdldCgpLCB0YXJnZXRUYWcp OworfQorCitib29sIEhUTUxFbGVtZW50U3RhY2s6OmluQnV0dG9uU2NvcGUoY29uc3QgUXVhbGlm aWVkTmFtZSYgdGFnTmFtZSkgY29uc3QKK3sKKyAgICAvLyBGSVhNRTogSXMgbG9jYWxOYW1lKCkg cmlnaHQgZm9yIG5vbi1odG1sIGVsZW1lbnRzPworICAgIHJldHVybiBpbkJ1dHRvblNjb3BlKHRh Z05hbWUubG9jYWxOYW1lKCkpOworfQorCiBFbGVtZW50KiBIVE1MRWxlbWVudFN0YWNrOjpodG1s RWxlbWVudCgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKG1faHRtbEVsZW1lbnQpOwpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50U3RhY2suaCBiL1dlYkNvcmUvaHRtbC9IVE1MRWxl bWVudFN0YWNrLmgKaW5kZXggODMwZmFmMDEwNTkzOWY1ZjMwYmExZjViOTQ5YTczZmU2ZWFiNjJi NC4uNTk2OWM4MGVkMTM3YzVjZDEzODgxNjcxYjJhMDAwNTdmNGU4OGYwNSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9odG1sL0hUTUxFbGVtZW50U3RhY2suaAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTEVs ZW1lbnRTdGFjay5oCkBAIC0xMDcsNiArMTA3LDggQEAgcHVibGljOgogICAgIGJvb2wgaW5MaXN0 SXRlbVNjb3BlKGNvbnN0IFF1YWxpZmllZE5hbWUmKSBjb25zdDsKICAgICBib29sIGluVGFibGVT Y29wZShjb25zdCBBdG9taWNTdHJpbmcmIHRhZ05hbWUpIGNvbnN0OwogICAgIGJvb2wgaW5UYWJs ZVNjb3BlKGNvbnN0IFF1YWxpZmllZE5hbWUmKSBjb25zdDsKKyAgICBib29sIGluQnV0dG9uU2Nv cGUoY29uc3QgQXRvbWljU3RyaW5nJiB0YWdOYW1lKSBjb25zdDsKKyAgICBib29sIGluQnV0dG9u U2NvcGUoY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0OwogCiAgICAgYm9vbCBoYXNPbmx5SFRN TEVsZW1lbnRzSW5TY29wZSgpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRN TFRyZWVCdWlsZGVyLmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwCmluZGV4 IDkzZGEzZjc3OGNhZTFhOWEyYWEwNGRmOWNjNWRlNDM2ODUzOTM0ZTcuLjEzYjZmNWMzYzIwYTdi NDE2NGU3MThiNjJmMmQxYTM2ODY3NDhlZjAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M VHJlZUJ1aWxkZXIuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwCkBA IC0xODMsNyArMTgzLDYgQEAgYm9vbCBpc1NwZWNpYWxUYWcoY29uc3QgQXRvbWljU3RyaW5nJiB0 YWdOYW1lKQogYm9vbCBpc1Njb3BpbmdUYWcoY29uc3QgQXRvbWljU3RyaW5nJiB0YWdOYW1lKQog ewogICAgIHJldHVybiB0YWdOYW1lID09IGFwcGxldFRhZwotICAgICAgICB8fCB0YWdOYW1lID09 IGJ1dHRvblRhZwogICAgICAgICB8fCB0YWdOYW1lID09IGNhcHRpb25UYWcKICAgICAgICAgfHwg dGFnTmFtZSA9PSBTVkdOYW1lczo6Zm9yZWlnbk9iamVjdFRhZwogICAgICAgICB8fCB0YWdOYW1l ID09IGh0bWxUYWcKQEAgLTU3Miw5ICs1NzEsOSBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJv Y2Vzc0Zha2VDaGFyYWN0ZXJzKGNvbnN0IFN0cmluZyYgY2hhcmFjdGVycykKICAgICBwcm9jZXNz Q2hhcmFjdGVyQnVmZmVyKGJ1ZmZlcik7CiB9CiAKLXZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9j ZXNzRmFrZVBFbmRUYWdJZlBJblNjb3BlKCkKK3ZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNz RmFrZVBFbmRUYWdJZlBJbkJ1dHRvblNjb3BlKCkKIHsKLSAgICBpZiAoIW1fdHJlZS5vcGVuRWxl bWVudHMoKS0+aW5TY29wZShwVGFnLmxvY2FsTmFtZSgpKSkKKyAgICBpZiAoIW1fdHJlZS5vcGVu RWxlbWVudHMoKS0+aW5CdXR0b25TY29wZShwVGFnLmxvY2FsTmFtZSgpKSkKICAgICAgICAgcmV0 dXJuOwogICAgIEF0b21pY0hUTUxUb2tlbiBlbmRQKEhUTUxUb2tlbjo6RW5kVGFnLCBwVGFnLmxv Y2FsTmFtZSgpKTsKICAgICBwcm9jZXNzRW5kVGFnKGVuZFApOwpAQCAtNjU0LDcgKzY1Myw3IEBA IHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzQ2xvc2VXaGVuTmVzdGVkVGFnKEF0b21pY0hU TUxUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgbm9kZVJlY29yZCA9 IG5vZGVSZWNvcmQtPm5leHQoKTsKICAgICB9Ci0gICAgcHJvY2Vzc0Zha2VQRW5kVGFnSWZQSW5T Y29wZSgpOworICAgIHByb2Nlc3NGYWtlUEVuZFRhZ0lmUEluQnV0dG9uU2NvcGUoKTsKICAgICBt X3RyZWUuaW5zZXJ0SFRNTEVsZW1lbnQodG9rZW4pOwogfQogCkBAIC04MjAsMTIgKzgxOSwxMiBA QCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnRm9ySW5Cb2R5KEF0b21pY0hU TUxUb2tlbiYgdG9rZW4pCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBwVGFnCiAgICAgICAg IHx8IHRva2VuLm5hbWUoKSA9PSBzZWN0aW9uVGFnCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9 PSB1bFRhZykgewotICAgICAgICBwcm9jZXNzRmFrZVBFbmRUYWdJZlBJblNjb3BlKCk7CisgICAg ICAgIHByb2Nlc3NGYWtlUEVuZFRhZ0lmUEluQnV0dG9uU2NvcGUoKTsKICAgICAgICAgbV90cmVl Lmluc2VydEhUTUxFbGVtZW50KHRva2VuKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBp ZiAoaXNOdW1iZXJlZEhlYWRlclRhZyh0b2tlbi5uYW1lKCkpKSB7Ci0gICAgICAgIHByb2Nlc3NG YWtlUEVuZFRhZ0lmUEluU2NvcGUoKTsKKyAgICAgICAgcHJvY2Vzc0Zha2VQRW5kVGFnSWZQSW5C dXR0b25TY29wZSgpOwogICAgICAgICBpZiAoaXNOdW1iZXJlZEhlYWRlclRhZyhtX3RyZWUuY3Vy cmVudEVsZW1lbnQoKS0+bG9jYWxOYW1lKCkpKSB7CiAgICAgICAgICAgICBwYXJzZUVycm9yKHRv a2VuKTsKICAgICAgICAgICAgIG1fdHJlZS5vcGVuRWxlbWVudHMoKS0+cG9wKCk7CkBAIC04MzQs NyArODMzLDcgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZ0ZvckluQm9k eShBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGlm ICh0b2tlbi5uYW1lKCkgPT0gcHJlVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBsaXN0aW5nVGFnKSB7 Ci0gICAgICAgIHByb2Nlc3NGYWtlUEVuZFRhZ0lmUEluU2NvcGUoKTsKKyAgICAgICAgcHJvY2Vz c0Zha2VQRW5kVGFnSWZQSW5CdXR0b25TY29wZSgpOwogICAgICAgICBtX3RyZWUuaW5zZXJ0SFRN TEVsZW1lbnQodG9rZW4pOwogICAgICAgICBtX3Rva2VuaXplci0+c2tpcExlYWRpbmdOZXdMaW5l Rm9yTGlzdGluZygpOwogICAgICAgICBtX2ZyYW1lc2V0T2sgPSBmYWxzZTsKQEAgLTg0NSw3ICs4 NDQsNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnRm9ySW5Cb2R5KEF0 b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAgICBwcm9jZXNzRmFrZVBFbmRUYWdJ ZlBJblNjb3BlKCk7CisgICAgICAgIHByb2Nlc3NGYWtlUEVuZFRhZ0lmUEluQnV0dG9uU2NvcGUo KTsKICAgICAgICAgbV90cmVlLmluc2VydEhUTUxGb3JtRWxlbWVudCh0b2tlbik7CiAgICAgICAg IHJldHVybjsKICAgICB9CkBAIC04NTgsNyArODU3LDcgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6 OnByb2Nlc3NTdGFydFRhZ0ZvckluQm9keShBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAg ICByZXR1cm47CiAgICAgfQogICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gcGxhaW50ZXh0VGFnKSB7 Ci0gICAgICAgIHByb2Nlc3NGYWtlUEVuZFRhZ0lmUEluU2NvcGUoKTsKKyAgICAgICAgcHJvY2Vz c0Zha2VQRW5kVGFnSWZQSW5CdXR0b25TY29wZSgpOwogICAgICAgICBtX3RyZWUuaW5zZXJ0SFRN TEVsZW1lbnQodG9rZW4pOwogICAgICAgICBtX3Rva2VuaXplci0+c2V0U3RhdGUoSFRNTFRva2Vu aXplcjo6UExBSU5URVhUU3RhdGUpOwogICAgICAgICByZXR1cm47CkBAIC05NDcsNyArOTQ2LDcg QEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZ0ZvckluQm9keShBdG9taWNI VE1MVG9rZW4mIHRva2VuKQogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGlmICh0b2tlbi5u YW1lKCkgPT0gaHJUYWcpIHsKLSAgICAgICAgcHJvY2Vzc0Zha2VQRW5kVGFnSWZQSW5TY29wZSgp OworICAgICAgICBwcm9jZXNzRmFrZVBFbmRUYWdJZlBJbkJ1dHRvblNjb3BlKCk7CiAgICAgICAg IG1fdHJlZS5pbnNlcnRTZWxmQ2xvc2luZ0hUTUxFbGVtZW50KHRva2VuKTsKICAgICAgICAgbV9m cmFtZXNldE9rID0gZmFsc2U7CiAgICAgICAgIHJldHVybjsKQEAgLTk2Niw3ICs5NjUsNyBAQCB2 b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnRm9ySW5Cb2R5KEF0b21pY0hUTUxU b2tlbiYgdG9rZW4pCiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgaWYgKHRva2VuLm5hbWUo KSA9PSB4bXBUYWcpIHsKLSAgICAgICAgcHJvY2Vzc0Zha2VQRW5kVGFnSWZQSW5TY29wZSgpOwor ICAgICAgICBwcm9jZXNzRmFrZVBFbmRUYWdJZlBJbkJ1dHRvblNjb3BlKCk7CiAgICAgICAgIG1f dHJlZS5yZWNvbnN0cnVjdFRoZUFjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cygpOwogICAgICAgICBt X2ZyYW1lc2V0T2sgPSBmYWxzZTsKICAgICAgICAgcHJvY2Vzc0dlbmVyaWNSYXdUZXh0U3RhcnRU YWcodG9rZW4pOwpAQCAtMTk3Myw3ICsxOTcyLDcgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnBy b2Nlc3NFbmRUYWdGb3JJbkJvZHkoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgbV90 cmVlLm9wZW5FbGVtZW50cygpLT5yZW1vdmUobm9kZS5nZXQoKSk7CiAgICAgfQogICAgIGlmICh0 b2tlbi5uYW1lKCkgPT0gcFRhZykgewotICAgICAgICBpZiAoIW1fdHJlZS5vcGVuRWxlbWVudHMo KS0+aW5TY29wZSh0b2tlbi5uYW1lKCkpKSB7CisgICAgICAgIGlmICghbV90cmVlLm9wZW5FbGVt ZW50cygpLT5pbkJ1dHRvblNjb3BlKHRva2VuLm5hbWUoKSkpIHsKICAgICAgICAgICAgIHBhcnNl RXJyb3IodG9rZW4pOwogICAgICAgICAgICAgcHJvY2Vzc0Zha2VTdGFydFRhZyhwVGFnKTsKICAg ICAgICAgICAgIEFTU0VSVChtX3RyZWUub3BlbkVsZW1lbnRzKCktPmluU2NvcGUodG9rZW4ubmFt ZSgpKSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmggYi9XZWJD b3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmgKaW5kZXggMGY4N2NiMGQyMTdlODVmZjk2N2RkZDJj NTJjNGY0NzkyYzFjMzg4MC4uNzM1YzlmMzk1NjNhNTJmOTVlYmIwZWU3OGU4ZmYyYWVhZThiOTJl MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5oCisrKyBiL1dlYkNv cmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuaApAQCAtMTQwLDcgKzE0MCw3IEBAIHByaXZhdGU6CiAg ICAgdm9pZCBwcm9jZXNzRmFrZVN0YXJ0VGFnKGNvbnN0IFF1YWxpZmllZE5hbWUmLCBQYXNzUmVm UHRyPE5hbWVkTm9kZU1hcD4gYXR0cmlidXRlcyA9IDApOwogICAgIHZvaWQgcHJvY2Vzc0Zha2VF bmRUYWcoY29uc3QgUXVhbGlmaWVkTmFtZSYpOwogICAgIHZvaWQgcHJvY2Vzc0Zha2VDaGFyYWN0 ZXJzKGNvbnN0IFN0cmluZyYpOwotICAgIHZvaWQgcHJvY2Vzc0Zha2VQRW5kVGFnSWZQSW5TY29w ZSgpOworICAgIHZvaWQgcHJvY2Vzc0Zha2VQRW5kVGFnSWZQSW5CdXR0b25TY29wZSgpOwogCiAg ICAgdm9pZCBwcm9jZXNzR2VuZXJpY1JDREFUQVN0YXJ0VGFnKEF0b21pY0hUTUxUb2tlbiYpOwog ICAgIHZvaWQgcHJvY2Vzc0dlbmVyaWNSYXdUZXh0U3RhcnRUYWcoQXRvbWljSFRNTFRva2VuJik7 Cg==