41587 2010-07-04 18:54:45 -0700 Add basic "in table body" mode to support <tr> insertion 2010-07-05 10:56:45 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41123 1 eric eric abarth commit-queue oldest_to_newest 246472 0 eric 2010-07-04 18:54:45 -0700 Add basic "in table body" mode to support <tr> insertion 246473 1 60488 eric 2010-07-04 19:01:35 -0700 Created attachment 60488 Patch 246493 2 60488 abarth 2010-07-04 21:28:12 -0700 Comment on attachment 60488 Patch WebCore/html/HTMLTreeBuilder.cpp:787 + m_openElements.popUntilTableBodyScopeMarker(); // How is there ever anything to pop? We could add an assert that this is a nop if we want to learn. WebCore/html/HTMLTreeBuilder.cpp:805 + notImplemented(); // process using "in table" rules Our strategy here has been to move that code into a separate function that we can call. 246496 3 60488 commit-queue 2010-07-04 21:45:48 -0700 Comment on attachment 60488 Patch Clearing flags on attachment: 60488 Committed r62474: <http://trac.webkit.org/changeset/62474> 246497 4 commit-queue 2010-07-04 21:45:53 -0700 All reviewed patches have been landed. Closing bug. 246713 5 eric 2010-07-05 10:56:45 -0700 Yes, we can (and should) add such an ASSERT at some point. :) 60488 2010-07-04 19:01:35 -0700 2010-07-04 21:45:47 -0700 Patch bug-41587-20100704190128.patch text/plain 8683 eric ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwMjViMDA2ZTI0YWEyOTMxMWI1NmExNzZmZWJlM2FjMjU5OWIyYzRmLi5mNzk0Y2I4 ZWNjY2QyMWJiNTI2MzZlMmYzNThhMmQyMTJlNmE3YTA3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMTYgQEAK IAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBBZGQgYmFz aWMgImluIHRhYmxlIGJvZHkiIG1vZGUgdG8gc3VwcG9ydCA8dHI+IGluc2VydGlvbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE1ODcKKworICAgICAg ICAqIGh0bWw1bGliL3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQ6CisgICAgICAgICAtIDx0cj4g dGFncyBub3cgc2hvdyB1cCwgaW1hZ2luZSB0aGF0LgorCisyMDEwLTA3LTA0ICBFcmljIFNlaWRl bCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKwogICAgICAgICBGaW5pc2ggaW1wbGVtZW50aW5nICJhbnkgb3RoZXIgZW5kIHRhZyIgZm9y ICJpbiBib2R5IiBtb2RlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD00MTU4MgogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odG1sNWxpYi9ydW5uZXIt ZXhwZWN0ZWQtaHRtbDUudHh0IGIvTGF5b3V0VGVzdHMvaHRtbDVsaWIvcnVubmVyLWV4cGVjdGVk LWh0bWw1LnR4dAppbmRleCBkYzcxOGUyODU3OTYwOGNhZmZjZTFmNWIyOWVkMDBhODlmMGI2ZWQ5 Li44ZTRjYjYwZTE0ZDM0ZmY4MDFkMWRmMTFlMmU1MDUwOTliMWMxMDIxIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9odG1sNWxpYi9ydW5uZXItZXhwZWN0ZWQtaHRtbDUudHh0CisrKyBiL0xheW91 dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQKQEAgLTEzNDUsNiArMTM0 NSw3IEBAIEdvdDoKIHwgICA8Ym9keT4KIHwgICAgIDx0YWJsZT4KIHwgICAgICAgPHRib2R5Pgor fCAgICAgICAgIDx0cj4KIEV4cGVjdGVkOgogfCA8aHRtbD4KIHwgICA8aGVhZD4KQEAgLTI2MDEs NiArMjYwMiw3IEBAIEdvdDoKIHwgICA8Ym9keT4KIHwgICAgIDx0YWJsZT4KIHwgICAgICAgPHRi b2R5PgorfCAgICAgICAgIDx0cj4KIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0 bWw+CkBAIC0zMjMxLDYgKzMyMzMsNyBAQCBHb3Q6CiB8ICAgPGJvZHk+CiB8ICAgICA8dGFibGU+ CiB8ICAgICAgIDx0Ym9keT4KK3wgICAgICAgICA8dHI+CiBFeHBlY3RlZDoKIHwgPCFET0NUWVBF IGh0bWw+CiB8IDxodG1sPgpAQCAtMzI1NCw2ICszMjU3LDcgQEAgR290OgogfCAgIDxib2R5Pgog fCAgICAgPHRhYmxlPgogfCAgICAgICA8dGJvZHk+Cit8ICAgICAgICAgPHRyPgogRXhwZWN0ZWQ6 CiB8IDwhRE9DVFlQRSBodG1sPgogfCA8aHRtbD4KQEAgLTMyNzgsNiArMzI4Miw3IEBAIEdvdDoK IHwgICA8Ym9keT4KIHwgICAgIDx0YWJsZT4KIHwgICAgICAgPHRib2R5PgorfCAgICAgICAgIDx0 cj4KIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+CkBAIC0zNzQxLDYgKzM3 NDYsNyBAQCBHb3Q6CiB8ICAgPGJvZHk+CiB8ICAgICA8dGFibGU+CiB8ICAgICAgIDx0Ym9keT4K K3wgICAgICAgICA8dHI+CiBFeHBlY3RlZDoKIHwgPCFET0NUWVBFIGh0bWw+CiB8IDxodG1sPgpA QCAtMzc2NCw2ICszNzcwLDcgQEAgR290OgogfCAgIDxib2R5PgogfCAgICAgPHRhYmxlPgogfCAg ICAgICA8dGJvZHk+Cit8ICAgICAgICAgPHRyPgogRXhwZWN0ZWQ6CiB8IDwhRE9DVFlQRSBodG1s PgogfCA8aHRtbD4KQEAgLTM3ODgsNiArMzc5NSw3IEBAIEdvdDoKIHwgICA8Ym9keT4KIHwgICAg IDx0YWJsZT4KIHwgICAgICAgPHRib2R5PgorfCAgICAgICAgIDx0cj4KIEV4cGVjdGVkOgogfCA8 IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBi L1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDlkYWQ5NzhlOWExMmQxNzhhMTgxOGUzMTVlOTU2NTI0 OGQzZmZiZDguLmY5MTZhNzRkMTA5ZmQxN2RkZDQ1ZDBkMWIzYmMwYmZkOWVlYjcyMjggMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYg KzIsMjggQEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAg ICBBZGQgYmFzaWMgImluIHRhYmxlIGJvZHkiIG1vZGUgdG8gc3VwcG9ydCA8dHI+IGluc2VydGlv bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE1ODcK KworICAgICAgICBUaGlzIGFsc28gYWRkcyBhIChjdXJyZW50bHkgdW50ZXN0YWJsZT8pCisgICAg ICAgIHBvcFVudGlsVGFibGVCb2R5U2NvcGVNYXJrZXIgY29kZSBwYXRoLgorICAgICAgICBBbnkg dGFncyB3aGljaCB3b3VsZCBiZSBiZXR3ZWVuIGEgdGJvZHkgYSA8dHI+IHdvdWxkIGVuZCB1cAor ICAgICAgICBmb3N0ZXIgcGFyZW50ZWQgb3V0c2lkZSB0aGUgPHRhYmxlPi4gIEkgdGhpbmsgdGhl IHNwZWMgd2FzCisgICAgICAgIGp1c3QgYmVpbmcgb3Zlci1jYXV0aW91cyB3aXRoIHBvcFVudGls VGFibGVCb2R5U2NvcGVNYXJrZXIuCisKKyAgICAgICAgKiBodG1sL0hUTUxFbGVtZW50U3RhY2su Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE5hbWVzOjppc1RhYmxlU2NvcGVNYXJrZXIpOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTE5hbWVzOjppc1RhYmxlQm9keVNjb3BlTWFya2VyKToKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxFbGVtZW50U3RhY2s6OnBvcFVudGlsVGFibGVCb2R5U2NvcGVN YXJrZXIpOgorICAgICAgICAqIGh0bWwvSFRNTEVsZW1lbnRTdGFjay5oOgorICAgICAgICAqIGh0 bWwvSFRNTFRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRl cjo6cHJvY2Vzc1N0YXJ0VGFnKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6 Y2FsbFRoZUFkb3B0aW9uQWdlbmN5KToKKworMjAxMC0wNy0wNCAgRXJpYyBTZWlkZWwgIDxlcmlj QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAg ICAgICAgRmluaXNoIGltcGxlbWVudGluZyAiYW55IG90aGVyIGVuZCB0YWciIGZvciAiaW4gYm9k eSIgbW9kZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDE1ODIKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50U3RhY2suY3BwIGIv V2ViQ29yZS9odG1sL0hUTUxFbGVtZW50U3RhY2suY3BwCmluZGV4IGMwMzQ4Y2JjN2M1ZWRhMmEw M2JhM2MxODg0ZDljYjI3NGRmN2MwZjcuLjJmMWI3OTI3MmExY2MyY2Q3OGQ1MDUzNTU5YTc1ZTg1 NWIwNWEzY2YgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudFN0YWNrLmNwcAor KysgYi9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnRTdGFjay5jcHAKQEAgLTY0LDggKzY0LDE2IEBA IGlubGluZSBib29sIGlzTGlzdEl0ZW1TY29wZU1hcmtlcihFbGVtZW50KiBlbGVtZW50KQogfQog aW5saW5lIGJvb2wgaXNUYWJsZVNjb3BlTWFya2VyKEVsZW1lbnQqIGVsZW1lbnQpCiB7Ci0gICAg cmV0dXJuIGVsZW1lbnQtPmhhc1RhZ05hbWUoaHRtbFRhZykKLSAgICAgICAgfHwgZWxlbWVudC0+ aGFzVGFnTmFtZSh0YWJsZVRhZyk7CisgICAgcmV0dXJuIGVsZW1lbnQtPmhhc1RhZ05hbWUodGFi bGVUYWcpCisgICAgICAgIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUoaHRtbFRhZyk7Cit9CisKK2lu bGluZSBib29sIGlzVGFibGVCb2R5U2NvcGVNYXJrZXIoRWxlbWVudCogZWxlbWVudCkKK3sKKyAg ICByZXR1cm4gZWxlbWVudC0+aGFzVGFnTmFtZSh0Ym9keVRhZykKKyAgICAgICAgfHwgZWxlbWVu dC0+aGFzVGFnTmFtZSh0Zm9vdFRhZykKKyAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFnTmFtZSh0 aGVhZFRhZykKKyAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFnTmFtZShodG1sVGFnKTsKIH0KIAog fQpAQCAtMTUwLDYgKzE1OCwxMyBAQCB2b2lkIEhUTUxFbGVtZW50U3RhY2s6OnBvcFVudGlsVGFi bGVTY29wZU1hcmtlcigpCiAgICAgICAgIHBvcCgpOwogfQogCit2b2lkIEhUTUxFbGVtZW50U3Rh Y2s6OnBvcFVudGlsVGFibGVCb2R5U2NvcGVNYXJrZXIoKQoreworICAgIC8vIGh0dHA6Ly93d3cu d2hhdHdnLm9yZy9zcGVjcy93ZWItYXBwcy9jdXJyZW50LXdvcmsvbXVsdGlwYWdlL3Rva2VuaXph dGlvbi5odG1sI2NsZWFyLXRoZS1zdGFjay1iYWNrLXRvLWEtdGFibGUtYm9keS1jb250ZXh0Cisg ICAgd2hpbGUgKCFpc1RhYmxlQm9keVNjb3BlTWFya2VyKHRvcCgpKSkKKyAgICAgICAgcG9wKCk7 Cit9CisKIHZvaWQgSFRNTEVsZW1lbnRTdGFjazo6cHVzaEhUTUxIdG1sRWxlbWVudChQYXNzUmVm UHRyPEVsZW1lbnQ+IGVsZW1lbnQpCiB7CiAgICAgQVNTRVJUKCFtX3RvcCk7IC8vIDxodG1sPiBz aG91bGQgYWx3YXlzIGJlIHRoZSBib3R0b20gb2YgdGhlIHN0YWNrLgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxFbGVtZW50U3RhY2suaCBiL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudFN0 YWNrLmgKaW5kZXggMGUyYzc3OWQ1Mzk0NDBmZDI2NGVmZDQwYjE4ODZmNTM0ODlkNGJkOS4uZWZj M2ZkOGQwZDFkNDZjMmYyOTUyNjE2NTRlMTQ1OWVkZjAwY2QxZiAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9odG1sL0hUTUxFbGVtZW50U3RhY2suaAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnRT dGFjay5oCkBAIC04Myw2ICs4Myw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHBvcFVudGlsKGNvbnN0 IEF0b21pY1N0cmluZyYgdGFnTmFtZSk7CiAgICAgdm9pZCBwb3BVbnRpbChFbGVtZW50Kik7CiAg ICAgdm9pZCBwb3BVbnRpbFRhYmxlU2NvcGVNYXJrZXIoKTsgLy8gImNsZWFyIHRoZSBzdGFjayBi YWNrIHRvIGEgdGFibGUgY29udGV4dCIgaW4gdGhlIHNwZWMuCisgICAgdm9pZCBwb3BVbnRpbFRh YmxlQm9keVNjb3BlTWFya2VyKCk7IC8vICJjbGVhciB0aGUgc3RhY2sgYmFjayB0byBhIHRhYmxl IGJvZHkgY29udGV4dCIgaW4gdGhlIHNwZWMuCiAgICAgdm9pZCBwb3BIVE1MSGVhZEVsZW1lbnQo KTsKICAgICB2b2lkIHBvcEhUTUxCb2R5RWxlbWVudCgpOwogCmRpZmYgLS1naXQgYS9XZWJDb3Jl L2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIu Y3BwCmluZGV4IDcwZjk0ZDg5N2NjMDQ0YTUzN2JlYjQ5MDljNDkyZTFmMGMyMTQ4ZjMuLmJmMGI3 ZjEzYmEwZDc4OGFhYmI5ZmNlZjdhNWViYjQ4YzgzZjkwNjEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxk ZXIuY3BwCkBAIC03Nyw2ICs3NywxMyBAQCBib29sIGlzTnVtYmVyZWRIZWFkZXJUYWcoY29uc3Qg QXRvbWljU3RyaW5nJiB0YWdOYW1lKQogICAgICAgICB8fCB0YWdOYW1lID09IGg2VGFnOwogfQog Citib29sIGlzVGFibGVCb2R5Q29udGV4dFRhZyhjb25zdCBBdG9taWNTdHJpbmcmIHRhZ05hbWUp Cit7CisgICAgcmV0dXJuIHRhZ05hbWUgPT0gdGJvZHlUYWcKKyAgICAgICAgfHwgdGFnTmFtZSA9 PSB0Zm9vdFRhZworICAgICAgICB8fCB0YWdOYW1lID09IHRoZWFkVGFnOworfQorCiAvLyBodHRw Oi8vd3d3LndoYXR3Zy5vcmcvc3BlY3Mvd2ViLWFwcHMvY3VycmVudC13b3JrL211bHRpcGFnZS9w YXJzaW5nLmh0bWwjc3BlY2lhbAogYm9vbCBpc1NwZWNpYWxUYWcoY29uc3QgQXRvbWljU3RyaW5n JiB0YWdOYW1lKQogewpAQCAtMTM0LDEwICsxNDEsOCBAQCBib29sIGlzU3BlY2lhbFRhZyhjb25z dCBBdG9taWNTdHJpbmcmIHRhZ05hbWUpCiAgICAgICAgIHx8IHRhZ05hbWUgPT0gc2VjdGlvblRh ZwogICAgICAgICB8fCB0YWdOYW1lID09IHNlbGVjdFRhZwogICAgICAgICB8fCB0YWdOYW1lID09 IHN0eWxlVGFnCi0gICAgICAgIHx8IHRhZ05hbWUgPT0gdGJvZHlUYWcKKyAgICAgICAgfHwgaXNU YWJsZUJvZHlDb250ZXh0VGFnKHRhZ05hbWUpCiAgICAgICAgIHx8IHRhZ05hbWUgPT0gdGV4dGFy ZWFUYWcKLSAgICAgICAgfHwgdGFnTmFtZSA9PSB0Zm9vdFRhZwotICAgICAgICB8fCB0YWdOYW1l ID09IHRoZWFkVGFnCiAgICAgICAgIHx8IHRhZ05hbWUgPT0gdGl0bGVUYWcKICAgICAgICAgfHwg dGFnTmFtZSA9PSB0clRhZwogICAgICAgICB8fCB0YWdOYW1lID09IHVsVGFnCkBAIC03NDQsNyAr NzQ5LDcgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZyhBdG9taWNIVE1M VG9rZW4mIHRva2VuKQogICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgfQotICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IHRib2R5VGFn IHx8IHRva2VuLm5hbWUoKSA9PSB0Zm9vdFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gdGhlYWRUYWcp IHsKKyAgICAgICAgaWYgKGlzVGFibGVCb2R5Q29udGV4dFRhZyh0b2tlbi5uYW1lKCkpKSB7CiAg ICAgICAgICAgICBtX29wZW5FbGVtZW50cy5wb3BVbnRpbFRhYmxlU2NvcGVNYXJrZXIoKTsKICAg ICAgICAgICAgIGluc2VydEVsZW1lbnQodG9rZW4pOwogICAgICAgICAgICAgbV9pbnNlcnRpb25N b2RlID0gSW5UYWJsZUJvZHlNb2RlOwpAQCAtNzc2LDYgKzc4MSwyOSBAQCB2b2lkIEhUTUxUcmVl QnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgICAg IHBhcnNlRXJyb3IodG9rZW4pOwogICAgICAgICBub3RJbXBsZW1lbnRlZCgpOwogICAgICAgICBi cmVhazsKKyAgICBjYXNlIEluVGFibGVCb2R5TW9kZToKKyAgICAgICAgQVNTRVJUKGluc2VydGlv bk1vZGUoKSA9PSBJblRhYmxlQm9keU1vZGUpOworICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09 IHRyVGFnKSB7CisgICAgICAgICAgICBtX29wZW5FbGVtZW50cy5wb3BVbnRpbFRhYmxlQm9keVNj b3BlTWFya2VyKCk7IC8vIEhvdyBpcyB0aGVyZSBldmVyIGFueXRoaW5nIHRvIHBvcD8KKyAgICAg ICAgICAgIGluc2VydEVsZW1lbnQodG9rZW4pOworICAgICAgICAgICAgbV9pbnNlcnRpb25Nb2Rl ID0gSW5Sb3dNb2RlOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGlm ICh0b2tlbi5uYW1lKCkgPT0gdGhUYWcgfHwgdG9rZW4ubmFtZSgpID09IHRkVGFnKSB7CisgICAg ICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKKyAgICAgICAgICAgIEF0b21pY0hUTUxUb2tlbiBm YWtlVG9rZW4oSFRNTFRva2VuOjpTdGFydFRhZywgdHJUYWcubG9jYWxOYW1lKCkpOworICAgICAg ICAgICAgcHJvY2Vzc1N0YXJ0VGFnKGZha2VUb2tlbik7CisgICAgICAgICAgICBBU1NFUlQoaW5z ZXJ0aW9uTW9kZSgpID09IEluUm93TW9kZSk7CisgICAgICAgICAgICBwcm9jZXNzU3RhcnRUYWco dG9rZW4pOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGlmICh0b2tl bi5uYW1lKCkgPT0gY2FwdGlvblRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gY29sVGFnIHx8IHRva2Vu Lm5hbWUoKSA9PSBjb2xncm91cFRhZyB8fCBpc1RhYmxlQm9keUNvbnRleHRUYWcodG9rZW4ubmFt ZSgpKSkgeworICAgICAgICAgICAgLy8gRklYTUU6IFRoZSBzcGVjIGlzIHVuY2xlYXIgYXMgdG8g d2hhdCBpcyBzdXBwb3NlZCB0byBoYXBwZW4gaGVyZS4KKyAgICAgICAgICAgIG5vdEltcGxlbWVu dGVkKCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgbm90SW1wbGVt ZW50ZWQoKTsgLy8gcHJvY2VzcyB1c2luZyAiaW4gdGFibGUiIHJ1bGVzCisgICAgICAgIGJyZWFr OwogICAgIGNhc2UgQWZ0ZXJCb2R5TW9kZToKICAgICBjYXNlIEFmdGVyQWZ0ZXJCb2R5TW9kZToK ICAgICAgICAgQVNTRVJUKGluc2VydGlvbk1vZGUoKSA9PSBBZnRlckJvZHlNb2RlIHx8IGluc2Vy dGlvbk1vZGUoKSA9PSBBZnRlckFmdGVyQm9keU1vZGUpOwpAQCAtMTAxMSwxMCArMTAzOSw4IEBA IHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpjYWxsVGhlQWRvcHRpb25BZ2VuY3koQXRvbWljSFRNTFRv a2VuJiB0b2tlbikKICAgICAgICAgLy8gNwogICAgICAgICBjb25zdCBBdG9taWNTdHJpbmcmIGNv bW1vbkFuY2VzdG9yVGFnID0gY29tbW9uQW5jZXN0b3ItPmxvY2FsTmFtZSgpOwogICAgICAgICBp ZiAoY29tbW9uQW5jZXN0b3JUYWcgPT0gdGFibGVUYWcKLSAgICAgICAgICAgIHx8IGNvbW1vbkFu Y2VzdG9yVGFnID09IHRib2R5VGFnCi0gICAgICAgICAgICB8fCBjb21tb25BbmNlc3RvclRhZyA9 PSB0Zm9vdFRhZwotICAgICAgICAgICAgfHwgY29tbW9uQW5jZXN0b3JUYWcgPT0gdGhlYWRUYWcK LSAgICAgICAgICAgIHx8IGNvbW1vbkFuY2VzdG9yVGFnID09IHRyVGFnKQorICAgICAgICAgICAg fHwgY29tbW9uQW5jZXN0b3JUYWcgPT0gdHJUYWcKKyAgICAgICAgICAgIHx8IGlzVGFibGVCb2R5 Q29udGV4dFRhZyhjb21tb25BbmNlc3RvclRhZykpCiAgICAgICAgICAgICBmaW5kRm9zdGVyUGFy ZW50Rm9yKGxhc3ROb2RlLT5lbGVtZW50KCkpOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAg IEV4Y2VwdGlvbkNvZGUgZWM7Cg==