41402 2010-06-30 04:10:38 -0700 Implement HTML5 "in scope" algorithm and attempt to use it 2010-06-30 13:36:24 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41399 41123 1 eric eric abarth commit-queue eric webkit.review.bot oldest_to_newest 244722 0 eric 2010-06-30 04:10:38 -0700 Implement HTML5 "in scope" algorithm and attempt to use it 244723 1 60107 eric 2010-06-30 04:14:14 -0700 Created attachment 60107 Patch 244724 2 60107 eric 2010-06-30 04:17:20 -0700 Comment on attachment 60107 Patch Nevermind. This causes a test failure. I'll look at this more tomorrow. 244726 3 60109 eric 2010-06-30 04:43:44 -0700 Created attachment 60109 Patch 244888 4 60109 abarth 2010-06-30 12:38:16 -0700 Comment on attachment 60109 Patch WebCore/html/HTMLElementStack.cpp:36 + using namespace HTMLNames; Ah, i see you have it now :) WebCore/html/HTMLElementStack.cpp:186 + if (isMarker(element)) We might want to store these bits in the ElementRecord instead of testing each time, depending on how expensive these branches end up being. 244902 5 60109 commit-queue 2010-06-30 13:03:03 -0700 Comment on attachment 60109 Patch Clearing flags on attachment: 60109 Committed r62196: <http://trac.webkit.org/changeset/62196> 244903 6 commit-queue 2010-06-30 13:03:08 -0700 All reviewed patches have been landed. Closing bug. 244906 7 webkit.review.bot 2010-06-30 13:09:47 -0700 http://trac.webkit.org/changeset/62196 might have broken Qt Linux Release minimal 244916 8 eric 2010-06-30 13:36:24 -0700 (In reply to comment #4) > (From update of attachment 60109 [details]) > WebCore/html/HTMLElementStack.cpp:36 > + using namespace HTMLNames; > Ah, i see you have it now :) > > WebCore/html/HTMLElementStack.cpp:186 > + if (isMarker(element)) > We might want to store these bits in the ElementRecord instead of testing each time, depending on how expensive these branches end up being. I think that's an excellent idea! 60107 2010-06-30 04:14:14 -0700 2010-06-30 04:43:40 -0700 Patch bug-41402-20100630041413.patch text/plain 8338 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YThmZTNhNDNmMzA1Mjc1MmI5MWUyMjllN2Q3NzU4ZmEwNGQ5OTA3ZC4uMDY1ODBlODQyNDA5YzJj OTY2NzFhODM3MTQzNDA5NDFlMTYzN2I2MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwzMCBAQAogCiAgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAgIEltcGxlbWVudCBIVE1MNSAiaW4gc2Nv cGUiIGFsZ29yaXRobSBhbmQgYXR0ZW1wdCB0byB1c2UgaXQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxNDAyCisKKyAgICAgICAgVGhpcyBkb2Vzbid0 IHNlZW0gdG8gYWZmZWN0IGFueSB0ZXN0cyB5ZXQgYmVjYXVzZSB3ZSdyZSBub3QKKyAgICAgICAg cmVhbGx5IHVzaW5nICJpbiBzY29wZSIgaW4gdGhlIFRyZWVCdWlsZGVyIHlldC4KKworICAgICAg ICBJIGF0dGVtcHRlZCB0byBkZXBsb3kgaXQgdG8gb25lIHBsYWNlLCBidXQgSSB0aGluayB3ZSBz aG91bGQKKyAgICAgICAgY29uc2lkZXIgbGFuZGluZyB0aGlzIGFzLWlzIGFuZCB3b3JraW5nIGZy b20gaGVyZS4KKworICAgICAgICAqIGh0bWwvSFRNTEVsZW1lbnRTdGFjay5jcHA6CisgICAgICAg IChXZWJDb3JlOjppblNjb3BlQ29tbW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxFbGVtZW50 U3RhY2s6OmluU2NvcGUpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEVsZW1lbnRTdGFjazo6aW5M aXN0SXRlbVNjb3BlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxFbGVtZW50U3RhY2s6OmluVGFi bGVTY29wZSk6CisgICAgICAgICogaHRtbC9IVE1MRWxlbWVudFN0YWNrLmg6CisgICAgICAgICog aHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWls ZGVyOjpwcm9jZXNzQm9keUVuZFRhZ0ZvckluQm9keSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1M VHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWcpOgorICAgICAgICAqIGh0bWwvSFRNTFRyZWVCdWls ZGVyLmg6CisKKzIwMTAtMDYtMzAgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIFNwbGl0IEhUTUxF bGVtZW50U3RhY2sgb3V0IGludG8gaXRzIG93biBmaWxlCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTM5OQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0 bWwvSFRNTEVsZW1lbnRTdGFjay5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnRTdGFjay5j cHAKaW5kZXggMGI0YjFhMzQzZDVlY2EwNjJkOTBhZTFhZmQxYzg2Nzc4YjZmNjIxZC4uMDg0Mjk2 NTI4NDQ4Y2JlMjcxNDllZDE2MWEwMzgzODZjNTQzM2U4MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9o dG1sL0hUTUxFbGVtZW50U3RhY2suY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudFN0 YWNrLmNwcApAQCAtMjcsMTAgKzI3LDE0IEBACiAjaW5jbHVkZSAiSFRNTEVsZW1lbnRTdGFjay5o IgogCiAjaW5jbHVkZSAiRWxlbWVudC5oIgorI2luY2x1ZGUgIkhUTUxOYW1lcy5oIgorI2luY2x1 ZGUgIlNWR05hbWVzLmgiCiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCit1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOworCiBjbGFzcyBIVE1MRWxl bWVudFN0YWNrOjpFbGVtZW50UmVjb3JkIDogcHVibGljIE5vbmNvcHlhYmxlIHsKIHB1YmxpYzoK ICAgICBFbGVtZW50UmVjb3JkKFBhc3NSZWZQdHI8RWxlbWVudD4gZWxlbWVudCwgUGFzc093blB0 cjxFbGVtZW50UmVjb3JkPiBuZXh0KQpAQCAtMTQxLDIwICsxNDUsNzcgQEAgYm9vbCBIVE1MRWxl bWVudFN0YWNrOjpjb250YWlucyhFbGVtZW50KiBlbGVtZW50KSBjb25zdAogICAgIHJldHVybiBm YWxzZTsKIH0KIAotYm9vbCBIVE1MRWxlbWVudFN0YWNrOjppblNjb3BlKGNvbnN0IEF0b21pY1N0 cmluZyYgbmFtZSkgY29uc3QKK25hbWVzcGFjZSB7CisKK2lubGluZSBib29sIGlzU2NvcGVNYXJr ZXIoY29uc3QgRWxlbWVudCogZWxlbWVudCkKK3sKKyAgICByZXR1cm4gZWxlbWVudC0+aGFzVGFn TmFtZShhcHBsZXRUYWcpCisgICAgICAgIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUoY2FwdGlvblRh ZykKKyAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFnTmFtZShhcHBsZXRUYWcpCisgICAgICAgIHx8 IGVsZW1lbnQtPmhhc1RhZ05hbWUoaHRtbFRhZykKKyAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFn TmFtZSh0YWJsZVRhZykKKyAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFnTmFtZSh0ZFRhZykKKyAg ICAgICAgfHwgZWxlbWVudC0+aGFzVGFnTmFtZSh0aFRhZykKKyAgICAgICAgfHwgZWxlbWVudC0+ aGFzVGFnTmFtZShidXR0b25UYWcpCisgICAgICAgIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUobWFy cXVlZVRhZykKKyAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFnTmFtZShvYmplY3RUYWcpCisgICAg ICAgIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUoU1ZHTmFtZXM6OmZvcmVpZ25PYmplY3RUYWcpOwor fQorCitpbmxpbmUgYm9vbCBpc0xpc3RJdGVtU2NvcGVNYXJrZXIoY29uc3QgRWxlbWVudCogZWxl bWVudCkKK3sKKyAgICByZXR1cm4gaXNTY29wZU1hcmtlcihlbGVtZW50KQorICAgICAgICB8fCBl bGVtZW50LT5oYXNUYWdOYW1lKG9sVGFnKQorICAgICAgICB8fCBlbGVtZW50LT5oYXNUYWdOYW1l KHVsVGFnKTsKK30KK2lubGluZSBib29sIGlzVGFibGVTY29wZU1hcmtlcihjb25zdCBFbGVtZW50 KiBlbGVtZW50KQoreworICAgIHJldHVybiBlbGVtZW50LT5oYXNUYWdOYW1lKGh0bWxUYWcpCisg ICAgICAgIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUodGFibGVUYWcpOworfQorCit9CisKK3RlbXBs YXRlIDxib29sIGlzTWFya2VyKGNvbnN0IEVsZW1lbnQqKT4KK2Jvb2wgaW5TY29wZUNvbW1vbihI VE1MRWxlbWVudFN0YWNrOjpFbGVtZW50UmVjb3JkKiB0b3AsIGNvbnN0IEF0b21pY1N0cmluZyYg dGFyZ2V0VGFnKQoreworICAgIGZvciAoSFRNTEVsZW1lbnRTdGFjazo6RWxlbWVudFJlY29yZCog cG9zID0gdG9wOyBwb3M7IHBvcyA9IHBvcy0+bmV4dCgpKSB7CisgICAgICAgIEVsZW1lbnQqIGVs ZW1lbnQgPSBwb3MtPmVsZW1lbnQoKTsKKyAgICAgICAgaWYgKGVsZW1lbnQtPmhhc0xvY2FsTmFt ZSh0YXJnZXRUYWcpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIGlmIChpc01h cmtlcihlbGVtZW50KSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7IC8vIDxodG1sPiBpcyBhbHdheXMgb24gdGhlIHN0YWNrIGFuZCBp cyBhIHNjb3BlIG1hcmtlci4KKyAgICByZXR1cm4gZmFsc2U7Cit9CisKK2Jvb2wgSFRNTEVsZW1l bnRTdGFjazo6aW5TY29wZShFbGVtZW50KiB0YXJnZXRFbGVtZW50KSBjb25zdAogewotICAgIC8v IEZJWE1FOiBUaGlzIGFsZ29yaXRobSBpcyB3cm9uZy4KICAgICBmb3IgKEVsZW1lbnRSZWNvcmQq IHBvcyA9IG1fdG9wLmdldCgpOyBwb3M7IHBvcyA9IHBvcy0+bmV4dCgpKSB7Ci0gICAgICAgIGlm IChwb3MtPmVsZW1lbnQoKS0+dGFnUU5hbWUoKSA9PSBuYW1lKQorICAgICAgICBFbGVtZW50KiBl bGVtZW50ID0gcG9zLT5lbGVtZW50KCk7CisgICAgICAgIGlmIChlbGVtZW50ID09IHRhcmdldEVs ZW1lbnQpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgaWYgKGlzU2NvcGVNYXJr ZXIoZWxlbWVudCkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQorICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOyAvLyA8aHRtbD4gaXMgYWx3YXlzIG9uIHRoZSBzdGFjayBhbmQgaXMg YSBzY29wZSBtYXJrZXIuCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1ib29sIEhUTUxFbGVtZW50 U3RhY2s6OmluU2NvcGUoRWxlbWVudCogZWxlbWVudCkgY29uc3QKK2Jvb2wgSFRNTEVsZW1lbnRT dGFjazo6aW5TY29wZShjb25zdCBBdG9taWNTdHJpbmcmIHRhcmdldFRhZykgY29uc3QKK3sKKyAg ICByZXR1cm4gaW5TY29wZUNvbW1vbjxpc1Njb3BlTWFya2VyPihtX3RvcC5nZXQoKSwgdGFyZ2V0 VGFnKTsKK30KKworYm9vbCBIVE1MRWxlbWVudFN0YWNrOjppbkxpc3RJdGVtU2NvcGUoY29uc3Qg QXRvbWljU3RyaW5nJiB0YXJnZXRUYWcpIGNvbnN0Cit7CisgICAgcmV0dXJuIGluU2NvcGVDb21t b248aXNMaXN0SXRlbVNjb3BlTWFya2VyPihtX3RvcC5nZXQoKSwgdGFyZ2V0VGFnKTsKK30KKwor Ym9vbCBIVE1MRWxlbWVudFN0YWNrOjppblRhYmxlU2NvcGUoY29uc3QgQXRvbWljU3RyaW5nJiB0 YXJnZXRUYWcpIGNvbnN0CiB7Ci0gICAgLy8gRklYTUU6IFRoaXMgYWxnb3JpdGhtIGlzIHdyb25n LgotICAgIHJldHVybiBjb250YWlucyhlbGVtZW50KTsKKyAgICByZXR1cm4gaW5TY29wZUNvbW1v bjxpc1RhYmxlU2NvcGVNYXJrZXI+KG1fdG9wLmdldCgpLCB0YXJnZXRUYWcpOwogfQogCiBFbGVt ZW50KiBIVE1MRWxlbWVudFN0YWNrOjpodG1sRWxlbWVudCgpCmRpZmYgLS1naXQgYS9XZWJDb3Jl L2h0bWwvSFRNTEVsZW1lbnRTdGFjay5oIGIvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50U3RhY2su aAppbmRleCA4MDFhYjZhMmNkMzk5NTlkODAyYjUyMmVkMTAwNDc4OWE0N2EwMzcyLi43ZTcxNWJh YTdlZWFhNWJjMTY2MTRmMjJiNzAxMjBhOWI0ZDEwYWVhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0 bWwvSFRNTEVsZW1lbnRTdGFjay5oCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudFN0YWNr LmgKQEAgLTI2LDExICsyNiwxMyBAQAogI2lmbmRlZiBIVE1MRWxlbWVudFN0YWNrX2gKICNkZWZp bmUgSFRNTEVsZW1lbnRTdGFja19oCiAKLSNpbmNsdWRlICJIVE1MTmFtZXMuaCIKKyNpbmNsdWRl IDx3dGYvRm9yd2FyZC5oPgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgorI2luY2x1ZGUg PHd0Zi9Pd25QdHIuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFzcyBBdG9taWNTdHJp bmc7CiBjbGFzcyBFbGVtZW50OwogCiBjbGFzcyBIVE1MRWxlbWVudFN0YWNrIDogcHVibGljIE5v bmNvcHlhYmxlIHsKQEAgLTUzLDE5ICs1NSwyMiBAQCBwdWJsaWM6CiAKICAgICBib29sIGNvbnRh aW5zKEVsZW1lbnQqKSBjb25zdDsKIAotICAgIGJvb2wgaW5TY29wZShjb25zdCBBdG9taWNTdHJp bmcmIG5hbWUpIGNvbnN0OwogICAgIGJvb2wgaW5TY29wZShFbGVtZW50KikgY29uc3Q7CisgICAg Ym9vbCBpblNjb3BlKGNvbnN0IEF0b21pY1N0cmluZyYgdGFnTmFtZSkgY29uc3Q7CisgICAgYm9v bCBpbkxpc3RJdGVtU2NvcGUoY29uc3QgQXRvbWljU3RyaW5nJiB0YWdOYW1lKSBjb25zdDsKKyAg ICBib29sIGluVGFibGVTY29wZShjb25zdCBBdG9taWNTdHJpbmcmIHRhZ05hbWUpIGNvbnN0Owog CiAgICAgRWxlbWVudCogaHRtbEVsZW1lbnQoKTsKICAgICBFbGVtZW50KiBoZWFkRWxlbWVudCgp OwogICAgIEVsZW1lbnQqIGJvZHlFbGVtZW50KCk7CiAKKyAgICAvLyBQdWJsaWMgc28gZnJlZSBm dW5jdGlvbnMgY2FuIHVzZSBpdCwgYnV0IGRlZmluZWQgcHJpdmF0ZWx5LgorICAgIGNsYXNzIEVs ZW1lbnRSZWNvcmQ7CiBwcml2YXRlOgogICAgIHZvaWQgcHVzaENvbW1vbihQYXNzUmVmUHRyPEVs ZW1lbnQ+KTsKICAgICB2b2lkIHBvcENvbW1vbigpOwogICAgIHZvaWQgcmVtb3ZlTm9uRmlyc3RD b21tb24oRWxlbWVudCopOwogCi0gICAgY2xhc3MgRWxlbWVudFJlY29yZDsKICAgICBPd25QdHI8 RWxlbWVudFJlY29yZD4gbV90b3A7CiAKICAgICAvLyBXZSByZW1lbWJlciA8aHRtbD4sIDxoZWFk PiBhbmQgPGJvZHk+IGFzIHRoZXkgYXJlIHB1c2hlZC4gIFRoZWlyCmRpZmYgLS1naXQgYS9XZWJD b3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxk ZXIuY3BwCmluZGV4IGZlMWJkOWNlMDdmNTllMDU3MDk4OGIyNTgzMDNlM2IzMThhZmVhM2MuLjY0 MmY3ZDQ2YzljZTMzZmQ5NmU2MDM5MjZiMTQwZTIzMDgzNGEwM2IgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1 aWxkZXIuY3BwCkBAIC01ODcsNiArNTg3LDE3IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9j ZXNzU3RhcnRUYWcoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICB9CiB9CiAKK2Jvb2wgSFRN TFRyZWVCdWlsZGVyOjpwcm9jZXNzQm9keUVuZFRhZ0ZvckluQm9keShBdG9taWNIVE1MVG9rZW4m IHRva2VuKQoreworICAgIGlmICghbV9vcGVuRWxlbWVudHMuaW5TY29wZShib2R5VGFnKSkgewor ICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0K KyAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIG1faW5zZXJ0aW9uTW9kZSA9IEFmdGVyQm9keU1v ZGU7CisgICAgcmV0dXJuIHRydWU7Cit9CisKIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNz RW5kVGFnKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiB7CiAgICAgc3dpdGNoIChpbnNlcnRpb25N b2RlKCkpIHsKQEAgLTYzNCwxMiArNjQ1LDEyIEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9j ZXNzRW5kVGFnKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgY2FzZSBJbkJvZHlNb2RlOgog ICAgICAgICBBU1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09IEluQm9keU1vZGUpOwogICAgICAgICBp ZiAodG9rZW4ubmFtZSgpID09IGJvZHlUYWcpIHsKLSAgICAgICAgICAgIG5vdEltcGxlbWVudGVk KCk7Ci0gICAgICAgICAgICBtX2luc2VydGlvbk1vZGUgPSBBZnRlckJvZHlNb2RlOworICAgICAg ICAgICAgcHJvY2Vzc0JvZHlFbmRUYWdGb3JJbkJvZHkodG9rZW4pOwogICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICB9CiAgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gaHRtbFRhZykgewot ICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIGlmIChwcm9jZXNzQm9k eUVuZFRhZ0ZvckluQm9keSh0b2tlbikpCisgICAgICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQo KTsgLy8gUmUtcHJvY2VzcyB0aGUgY3VyZW50IHRva2VuLgogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9CiAgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gYWRkcmVzc1RhZyB8fCB0b2tl bi5uYW1lKCkgPT0gYXJ0aWNsZVRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gYXNpZGVUYWcgfHwgdG9r ZW4ubmFtZSgpID09IGJsb2NrcXVvdGVUYWcgfHwgdG9rZW4ubmFtZSgpID09IGJ1dHRvblRhZyB8 fCB0b2tlbi5uYW1lKCkgPT0gY2VudGVyVGFnIHx8IHRva2VuLm5hbWUoKSA9PSAiZGV0YWlscyIg fHwgdG9rZW4ubmFtZSgpID09IGRpclRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gZGl2VGFnIHx8IHRv a2VuLm5hbWUoKSA9PSBkbFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gZmllbGRzZXRUYWcgfHwgdG9r ZW4ubmFtZSgpID09ICJmaWd1cmUiIHx8IHRva2VuLm5hbWUoKSA9PSBmb290ZXJUYWcgfHwgdG9r ZW4ubmFtZSgpID09IGhlYWRlclRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gaGdyb3VwVGFnIHx8IHRv a2VuLm5hbWUoKSA9PSBsaXN0aW5nVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBtZW51VGFnIHx8IHRv a2VuLm5hbWUoKSA9PSBuYXZUYWcgfHwgdG9rZW4ubmFtZSgpID09IG9sVGFnIHx8IHRva2VuLm5h bWUoKSA9PSBwcmVUYWcgfHwgdG9rZW4ubmFtZSgpID09IHNlY3Rpb25UYWcgfHwgdG9rZW4ubmFt ZSgpID09IHVsVGFnKSB7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVy LmggYi9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmgKaW5kZXggN2U0MGRmMzQ1ZDdiMzJk OTdkMWVmMmZkYzcwOGE3ZTZlZThiODIzYy4uMTcwNjNmMjdkMTQ5NjBkZWM5NzRkOTlkMDgzOTVj ZDk2MzBkMmE2ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5oCisr KyBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuaApAQCAtMTIyLDYgKzEyMiw4IEBAIHBy aXZhdGU6CiAKICAgICBib29sIHByb2Nlc3NTdGFydFRhZ0ZvckluSGVhZChBdG9taWNIVE1MVG9r ZW4mKTsKIAorICAgIGJvb2wgcHJvY2Vzc0JvZHlFbmRUYWdGb3JJbkJvZHkoQXRvbWljSFRNTFRv a2VuJik7CisKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBDaGlsZFR5cGU+CiAgICAgUGFzc1JlZlB0 cjxDaGlsZFR5cGU+IGF0dGFjaChOb2RlKiBwYXJlbnQsIFBhc3NSZWZQdHI8Q2hpbGRUeXBlPiBw cnBDaGlsZCkKICAgICB7Cg== 60109 2010-06-30 04:43:44 -0700 2010-06-30 13:03:03 -0700 Patch bug-41402-20100630044342.patch text/plain 9935 eric ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxNjkwZjc0MzBiNjY2YWY1MjI5NTNlNjI3ODQwNWNkYzQ2OWE5MTJhLi43ODRkNmRi OTc2ZDQ4OGQ1MGIzNjIzODJmNGJlZWM0NDZhNmM5YTg1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkgQEAK IDIwMTAtMDYtMzAgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBIVE1MNSAiaW4g c2NvcGUiIGFsZ29yaXRobSBhbmQgYXR0ZW1wdCB0byB1c2UgaXQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxNDAyCisKKyAgICAgICAgQWRkcyB0d28g bmV3IChleHBlY3RlZCkgZmFpbHVyZXMsIHNpbmNlIHdlJ3JlIG5vdworICAgICAgICBzd2l0Y2hp bmcgb3V0IG9mIEluQm9keSB0byBBZnRlckJvZHkgd2hlbiBzZWVpbmcKKyAgICAgICAgPC9odG1s Pi4gIFdlIGRvbid0IGltcGxlbWVudCBBZnRlckJvZHkgeWV0LCBzbworICAgICAgICB0aGUgcmVz dCBvZiB0aGUgY29udGVudCBhZnRlciA8L2h0bWw+IGlzIGlnbm9yZWQuCisKKyAgICAgICAgKiBo dG1sNWxpYi9ydW5uZXItZXhwZWN0ZWQtaHRtbDUudHh0OgorCisyMDEwLTA2LTMwICBFcmljIFNl aWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKwogICAgICAgICBVbnJldmlld2VkLiAgSnVzdCB1cGRh dGluZyB0ZXN0IGV4cGVjdGF0aW9ucy4KIAogICAgICAgICBIVE1MVG9rZW5pemVyIG5lZWRzIEVu ZE9mRmlsZSBzdXBwb3J0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odG1sNWxpYi9ydW5uZXIt ZXhwZWN0ZWQtaHRtbDUudHh0IGIvTGF5b3V0VGVzdHMvaHRtbDVsaWIvcnVubmVyLWV4cGVjdGVk LWh0bWw1LnR4dAppbmRleCA5ZmIzYjdlYjA2N2I1ZWNmZjVlYzczOTNiMzY5MmIzNWYzZjgxNmQz Li5iOTkzMzI4MjM3ODhiMzBmYzI4MTc4MGM0NjI4NTEzMmU4ZTI2NzdlIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9odG1sNWxpYi9ydW5uZXItZXhwZWN0ZWQtaHRtbDUudHh0CisrKyBiL0xheW91 dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQKQEAgLTQ4LDYgKzQ4LDcg QEAgcmVzb3VyY2VzL3Rlc3RzMS5kYXQ6CiA4NgogODkKIDkwCis5MgogOTMKIDk0CiA5NQpAQCAt OTMsNiArOTQsNyBAQCByZXNvdXJjZXMvdGVzdHMyLmRhdDoKIDUxCiA1MwogNTQKKzU1CiA1OAog CiByZXNvdXJjZXMvdGVzdHMzLmRhdDoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYThmZTNhNDNmMzA1Mjc1MmI5MWUyMjllN2Q3NzU4ZmEw NGQ5OTA3ZC4uNzlmYTZjY2VlNWQxMGI0NGVmYzcwYmMwYjY0ZjQ4NTk0NWIzNjE2ZCAxMDA2NDQK LS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTIsNiAr MiwzNSBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAg IEltcGxlbWVudCBIVE1MNSAiaW4gc2NvcGUiIGFsZ29yaXRobSBhbmQgYXR0ZW1wdCB0byB1c2Ug aXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxNDAy CisKKyAgICAgICAgSW1wbGVtZW50ZWQgdGhlIDQgbmVlZGVkICJpbiBzY29wZSIgZnVuY3Rpb25z IGZvciBIVE1MNS4KKyAgICAgICAgMyBmb3IgdGhlIGRpZmZlcmVudCBzZXRzIG9mIHNjb3BlIG1h cmtlcnMsIGFuZCBvbmUgZm9yCisgICAgICAgIGRvaW5nIGV4YWN0IGVsZW1lbnQgY29tcGFyaXNv bnMgaW5zdGVhZCBvZiB0YWcgbmFtZSBzZWFyY2hlcy4KKworICAgICAgICBJIGRlcGxveWVkIGlu U2NvcGUoImJvZHkiKSBmb3IgPC9ib2R5PiBhbmQgPC9odG1sPiBpbiBJbkJvZHkuCisKKyAgICAg ICAgQWRkcyB0d28gbmV3IChleHBlY3RlZCkgZmFpbHVyZXMsIHNpbmNlIHdlJ3JlIG5vdworICAg ICAgICBzd2l0Y2hpbmcgb3V0IG9mIEluQm9keSB0byBBZnRlckJvZHkgd2hlbiBzZWVpbmcKKyAg ICAgICAgPC9odG1sPi4gIFdlIGRvbid0IGltcGxlbWVudCBBZnRlckJvZHkgeWV0LCBzbworICAg ICAgICB0aGUgcmVzdCBvZiB0aGUgY29udGVudCBhZnRlciA8L2h0bWw+IGlzIGlnbm9yZWQuCisK KyAgICAgICAgKiBodG1sL0hUTUxFbGVtZW50U3RhY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6 aW5TY29wZUNvbW1vbik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRWxlbWVudFN0YWNrOjppblNj b3BlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxFbGVtZW50U3RhY2s6OmluTGlzdEl0ZW1TY29w ZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRWxlbWVudFN0YWNrOjppblRhYmxlU2NvcGUpOgor ICAgICAgICAqIGh0bWwvSFRNTEVsZW1lbnRTdGFjay5oOgorICAgICAgICAqIGh0bWwvSFRNTFRy ZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vz c0JvZHlFbmRUYWdGb3JJbkJvZHkpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVy Ojpwcm9jZXNzRW5kVGFnKToKKyAgICAgICAgKiBodG1sL0hUTUxUcmVlQnVpbGRlci5oOgorCisy MDEwLTA2LTMwICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBTcGxpdCBIVE1MRWxlbWVudFN0YWNr IG91dCBpbnRvIGl0cyBvd24gZmlsZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDEzOTkKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxFbGVt ZW50U3RhY2suY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50U3RhY2suY3BwCmluZGV4IDBi NGIxYTM0M2Q1ZWNhMDYyZDkwYWUxYWZkMWM4Njc3OGI2ZjYyMWQuLjA4NDI5NjUyODQ0OGNiZTI3 MTQ5ZWQxNjFhMDM4Mzg2YzU0MzNlODIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MRWxl bWVudFN0YWNrLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnRTdGFjay5jcHAKQEAg LTI3LDEwICsyNywxNCBAQAogI2luY2x1ZGUgIkhUTUxFbGVtZW50U3RhY2suaCIKIAogI2luY2x1 ZGUgIkVsZW1lbnQuaCIKKyNpbmNsdWRlICJIVE1MTmFtZXMuaCIKKyNpbmNsdWRlICJTVkdOYW1l cy5oIgogI2luY2x1ZGUgPHd0Zi9QYXNzT3duUHRyLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAordXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKKwogY2xhc3MgSFRNTEVsZW1lbnRTdGFjazo6 RWxlbWVudFJlY29yZCA6IHB1YmxpYyBOb25jb3B5YWJsZSB7CiBwdWJsaWM6CiAgICAgRWxlbWVu dFJlY29yZChQYXNzUmVmUHRyPEVsZW1lbnQ+IGVsZW1lbnQsIFBhc3NPd25QdHI8RWxlbWVudFJl Y29yZD4gbmV4dCkKQEAgLTE0MSwyMCArMTQ1LDc3IEBAIGJvb2wgSFRNTEVsZW1lbnRTdGFjazo6 Y29udGFpbnMoRWxlbWVudCogZWxlbWVudCkgY29uc3QKICAgICByZXR1cm4gZmFsc2U7CiB9CiAK LWJvb2wgSFRNTEVsZW1lbnRTdGFjazo6aW5TY29wZShjb25zdCBBdG9taWNTdHJpbmcmIG5hbWUp IGNvbnN0CituYW1lc3BhY2UgeworCitpbmxpbmUgYm9vbCBpc1Njb3BlTWFya2VyKGNvbnN0IEVs ZW1lbnQqIGVsZW1lbnQpCit7CisgICAgcmV0dXJuIGVsZW1lbnQtPmhhc1RhZ05hbWUoYXBwbGV0 VGFnKQorICAgICAgICB8fCBlbGVtZW50LT5oYXNUYWdOYW1lKGNhcHRpb25UYWcpCisgICAgICAg IHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUoYXBwbGV0VGFnKQorICAgICAgICB8fCBlbGVtZW50LT5o YXNUYWdOYW1lKGh0bWxUYWcpCisgICAgICAgIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUodGFibGVU YWcpCisgICAgICAgIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUodGRUYWcpCisgICAgICAgIHx8IGVs ZW1lbnQtPmhhc1RhZ05hbWUodGhUYWcpCisgICAgICAgIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUo YnV0dG9uVGFnKQorICAgICAgICB8fCBlbGVtZW50LT5oYXNUYWdOYW1lKG1hcnF1ZWVUYWcpCisg ICAgICAgIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUob2JqZWN0VGFnKQorICAgICAgICB8fCBlbGVt ZW50LT5oYXNUYWdOYW1lKFNWR05hbWVzOjpmb3JlaWduT2JqZWN0VGFnKTsKK30KKworaW5saW5l IGJvb2wgaXNMaXN0SXRlbVNjb3BlTWFya2VyKGNvbnN0IEVsZW1lbnQqIGVsZW1lbnQpCit7Cisg ICAgcmV0dXJuIGlzU2NvcGVNYXJrZXIoZWxlbWVudCkKKyAgICAgICAgfHwgZWxlbWVudC0+aGFz VGFnTmFtZShvbFRhZykKKyAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFnTmFtZSh1bFRhZyk7Cit9 CitpbmxpbmUgYm9vbCBpc1RhYmxlU2NvcGVNYXJrZXIoY29uc3QgRWxlbWVudCogZWxlbWVudCkK K3sKKyAgICByZXR1cm4gZWxlbWVudC0+aGFzVGFnTmFtZShodG1sVGFnKQorICAgICAgICB8fCBl bGVtZW50LT5oYXNUYWdOYW1lKHRhYmxlVGFnKTsKK30KKworfQorCit0ZW1wbGF0ZSA8Ym9vbCBp c01hcmtlcihjb25zdCBFbGVtZW50Kik+Citib29sIGluU2NvcGVDb21tb24oSFRNTEVsZW1lbnRT dGFjazo6RWxlbWVudFJlY29yZCogdG9wLCBjb25zdCBBdG9taWNTdHJpbmcmIHRhcmdldFRhZykK K3sKKyAgICBmb3IgKEhUTUxFbGVtZW50U3RhY2s6OkVsZW1lbnRSZWNvcmQqIHBvcyA9IHRvcDsg cG9zOyBwb3MgPSBwb3MtPm5leHQoKSkgeworICAgICAgICBFbGVtZW50KiBlbGVtZW50ID0gcG9z LT5lbGVtZW50KCk7CisgICAgICAgIGlmIChlbGVtZW50LT5oYXNMb2NhbE5hbWUodGFyZ2V0VGFn KSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICBpZiAoaXNNYXJrZXIoZWxlbWVu dCkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOyAvLyA8aHRtbD4gaXMgYWx3YXlzIG9uIHRoZSBzdGFjayBhbmQgaXMgYSBzY29wZSBt YXJrZXIuCisgICAgcmV0dXJuIGZhbHNlOworfQorCitib29sIEhUTUxFbGVtZW50U3RhY2s6Omlu U2NvcGUoRWxlbWVudCogdGFyZ2V0RWxlbWVudCkgY29uc3QKIHsKLSAgICAvLyBGSVhNRTogVGhp cyBhbGdvcml0aG0gaXMgd3JvbmcuCiAgICAgZm9yIChFbGVtZW50UmVjb3JkKiBwb3MgPSBtX3Rv cC5nZXQoKTsgcG9zOyBwb3MgPSBwb3MtPm5leHQoKSkgewotICAgICAgICBpZiAocG9zLT5lbGVt ZW50KCktPnRhZ1FOYW1lKCkgPT0gbmFtZSkKKyAgICAgICAgRWxlbWVudCogZWxlbWVudCA9IHBv cy0+ZWxlbWVudCgpOworICAgICAgICBpZiAoZWxlbWVudCA9PSB0YXJnZXRFbGVtZW50KQogICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIGlmIChpc1Njb3BlTWFya2VyKGVsZW1lbnQp KQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KKyAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsgLy8gPGh0bWw+IGlzIGFsd2F5cyBvbiB0aGUgc3RhY2sgYW5kIGlzIGEgc2NvcGUgbWFy a2VyLgogICAgIHJldHVybiBmYWxzZTsKIH0KIAotYm9vbCBIVE1MRWxlbWVudFN0YWNrOjppblNj b3BlKEVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0Citib29sIEhUTUxFbGVtZW50U3RhY2s6OmluU2Nv cGUoY29uc3QgQXRvbWljU3RyaW5nJiB0YXJnZXRUYWcpIGNvbnN0Cit7CisgICAgcmV0dXJuIGlu U2NvcGVDb21tb248aXNTY29wZU1hcmtlcj4obV90b3AuZ2V0KCksIHRhcmdldFRhZyk7Cit9CisK K2Jvb2wgSFRNTEVsZW1lbnRTdGFjazo6aW5MaXN0SXRlbVNjb3BlKGNvbnN0IEF0b21pY1N0cmlu ZyYgdGFyZ2V0VGFnKSBjb25zdAoreworICAgIHJldHVybiBpblNjb3BlQ29tbW9uPGlzTGlzdEl0 ZW1TY29wZU1hcmtlcj4obV90b3AuZ2V0KCksIHRhcmdldFRhZyk7Cit9CisKK2Jvb2wgSFRNTEVs ZW1lbnRTdGFjazo6aW5UYWJsZVNjb3BlKGNvbnN0IEF0b21pY1N0cmluZyYgdGFyZ2V0VGFnKSBj b25zdAogewotICAgIC8vIEZJWE1FOiBUaGlzIGFsZ29yaXRobSBpcyB3cm9uZy4KLSAgICByZXR1 cm4gY29udGFpbnMoZWxlbWVudCk7CisgICAgcmV0dXJuIGluU2NvcGVDb21tb248aXNUYWJsZVNj b3BlTWFya2VyPihtX3RvcC5nZXQoKSwgdGFyZ2V0VGFnKTsKIH0KIAogRWxlbWVudCogSFRNTEVs ZW1lbnRTdGFjazo6aHRtbEVsZW1lbnQoKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxF bGVtZW50U3RhY2suaCBiL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudFN0YWNrLmgKaW5kZXggODAx YWI2YTJjZDM5OTU5ZDgwMmI1MjJlZDEwMDQ3ODlhNDdhMDM3Mi4uN2U3MTViYWE3ZWVhYTViYzE2 NjE0ZjIyYjcwMTIwYTliNGQxMGFlYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxFbGVt ZW50U3RhY2suaAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnRTdGFjay5oCkBAIC0yNiwx MSArMjYsMTMgQEAKICNpZm5kZWYgSFRNTEVsZW1lbnRTdGFja19oCiAjZGVmaW5lIEhUTUxFbGVt ZW50U3RhY2tfaAogCi0jaW5jbHVkZSAiSFRNTE5hbWVzLmgiCisjaW5jbHVkZSA8d3RmL0Zvcndh cmQuaD4KICNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KKyNpbmNsdWRlIDx3dGYvT3duUHRy Lmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgQXRvbWljU3RyaW5nOwogY2xhc3Mg RWxlbWVudDsKIAogY2xhc3MgSFRNTEVsZW1lbnRTdGFjayA6IHB1YmxpYyBOb25jb3B5YWJsZSB7 CkBAIC01MywxOSArNTUsMjIgQEAgcHVibGljOgogCiAgICAgYm9vbCBjb250YWlucyhFbGVtZW50 KikgY29uc3Q7CiAKLSAgICBib29sIGluU2NvcGUoY29uc3QgQXRvbWljU3RyaW5nJiBuYW1lKSBj b25zdDsKICAgICBib29sIGluU2NvcGUoRWxlbWVudCopIGNvbnN0OworICAgIGJvb2wgaW5TY29w ZShjb25zdCBBdG9taWNTdHJpbmcmIHRhZ05hbWUpIGNvbnN0OworICAgIGJvb2wgaW5MaXN0SXRl bVNjb3BlKGNvbnN0IEF0b21pY1N0cmluZyYgdGFnTmFtZSkgY29uc3Q7CisgICAgYm9vbCBpblRh YmxlU2NvcGUoY29uc3QgQXRvbWljU3RyaW5nJiB0YWdOYW1lKSBjb25zdDsKIAogICAgIEVsZW1l bnQqIGh0bWxFbGVtZW50KCk7CiAgICAgRWxlbWVudCogaGVhZEVsZW1lbnQoKTsKICAgICBFbGVt ZW50KiBib2R5RWxlbWVudCgpOwogCisgICAgLy8gUHVibGljIHNvIGZyZWUgZnVuY3Rpb25zIGNh biB1c2UgaXQsIGJ1dCBkZWZpbmVkIHByaXZhdGVseS4KKyAgICBjbGFzcyBFbGVtZW50UmVjb3Jk OwogcHJpdmF0ZToKICAgICB2b2lkIHB1c2hDb21tb24oUGFzc1JlZlB0cjxFbGVtZW50Pik7CiAg ICAgdm9pZCBwb3BDb21tb24oKTsKICAgICB2b2lkIHJlbW92ZU5vbkZpcnN0Q29tbW9uKEVsZW1l bnQqKTsKIAotICAgIGNsYXNzIEVsZW1lbnRSZWNvcmQ7CiAgICAgT3duUHRyPEVsZW1lbnRSZWNv cmQ+IG1fdG9wOwogCiAgICAgLy8gV2UgcmVtZW1iZXIgPGh0bWw+LCA8aGVhZD4gYW5kIDxib2R5 PiBhcyB0aGV5IGFyZSBwdXNoZWQuICBUaGVpcgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hU TUxUcmVlQnVpbGRlci5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcAppbmRl eCBmZTFiZDljZTA3ZjU5ZTA1NzA5ODhiMjU4MzAzZTNiMzE4YWZlYTNjLi5jMjIyMGVkOTc4MjNm NzlhZThlODNjMWQ2YzQ3ZWNkMDkxYWNhMGUxIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRN TFRyZWVCdWlsZGVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcApA QCAtNTg3LDYgKzU4NywxNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFn KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgfQogfQogCitib29sIEhUTUxUcmVlQnVpbGRl cjo6cHJvY2Vzc0JvZHlFbmRUYWdGb3JJbkJvZHkoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKK3sK KyAgICBpZiAoIW1fb3BlbkVsZW1lbnRzLmluU2NvcGUoYm9keVRhZy5sb2NhbE5hbWUoKSkpIHsK KyAgICAgICAgcGFyc2VFcnJvcih0b2tlbik7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9 CisgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBtX2luc2VydGlvbk1vZGUgPSBBZnRlckJvZHlN b2RlOworICAgIHJldHVybiB0cnVlOworfQorCiB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vz c0VuZFRhZyhBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogewogICAgIHN3aXRjaCAoaW5zZXJ0aW9u TW9kZSgpKSB7CkBAIC02MzQsMTIgKzY0NSwxMiBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJv Y2Vzc0VuZFRhZyhBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgIGNhc2UgSW5Cb2R5TW9kZToK ICAgICAgICAgQVNTRVJUKGluc2VydGlvbk1vZGUoKSA9PSBJbkJvZHlNb2RlKTsKICAgICAgICAg aWYgKHRva2VuLm5hbWUoKSA9PSBib2R5VGFnKSB7Ci0gICAgICAgICAgICBub3RJbXBsZW1lbnRl ZCgpOwotICAgICAgICAgICAgbV9pbnNlcnRpb25Nb2RlID0gQWZ0ZXJCb2R5TW9kZTsKKyAgICAg ICAgICAgIHByb2Nlc3NCb2R5RW5kVGFnRm9ySW5Cb2R5KHRva2VuKTsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgfQogICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGh0bWxUYWcpIHsK LSAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICBpZiAocHJvY2Vzc0Jv ZHlFbmRUYWdGb3JJbkJvZHkodG9rZW4pKQorICAgICAgICAgICAgICAgIG5vdEltcGxlbWVudGVk KCk7IC8vIFJlLXByb2Nlc3MgdGhlIGN1cmVudCB0b2tlbi4KICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgfQogICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGFkZHJlc3NUYWcgfHwgdG9r ZW4ubmFtZSgpID09IGFydGljbGVUYWcgfHwgdG9rZW4ubmFtZSgpID09IGFzaWRlVGFnIHx8IHRv a2VuLm5hbWUoKSA9PSBibG9ja3F1b3RlVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBidXR0b25UYWcg fHwgdG9rZW4ubmFtZSgpID09IGNlbnRlclRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gImRldGFpbHMi IHx8IHRva2VuLm5hbWUoKSA9PSBkaXJUYWcgfHwgdG9rZW4ubmFtZSgpID09IGRpdlRhZyB8fCB0 b2tlbi5uYW1lKCkgPT0gZGxUYWcgfHwgdG9rZW4ubmFtZSgpID09IGZpZWxkc2V0VGFnIHx8IHRv a2VuLm5hbWUoKSA9PSAiZmlndXJlIiB8fCB0b2tlbi5uYW1lKCkgPT0gZm9vdGVyVGFnIHx8IHRv a2VuLm5hbWUoKSA9PSBoZWFkZXJUYWcgfHwgdG9rZW4ubmFtZSgpID09IGhncm91cFRhZyB8fCB0 b2tlbi5uYW1lKCkgPT0gbGlzdGluZ1RhZyB8fCB0b2tlbi5uYW1lKCkgPT0gbWVudVRhZyB8fCB0 b2tlbi5uYW1lKCkgPT0gbmF2VGFnIHx8IHRva2VuLm5hbWUoKSA9PSBvbFRhZyB8fCB0b2tlbi5u YW1lKCkgPT0gcHJlVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBzZWN0aW9uVGFnIHx8IHRva2VuLm5h bWUoKSA9PSB1bFRhZykgewpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRl ci5oIGIvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5oCmluZGV4IDdlNDBkZjM0NWQ3YjMy ZDk3ZDFlZjJmZGM3MDhhN2U2ZWU4YjgyM2MuLjE3MDYzZjI3ZDE0OTYwZGVjOTc0ZDk5ZDA4Mzk1 Y2Q5NjMwZDJhNmQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuaAor KysgYi9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmgKQEAgLTEyMiw2ICsxMjIsOCBAQCBw cml2YXRlOgogCiAgICAgYm9vbCBwcm9jZXNzU3RhcnRUYWdGb3JJbkhlYWQoQXRvbWljSFRNTFRv a2VuJik7CiAKKyAgICBib29sIHByb2Nlc3NCb2R5RW5kVGFnRm9ySW5Cb2R5KEF0b21pY0hUTUxU b2tlbiYpOworCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgQ2hpbGRUeXBlPgogICAgIFBhc3NSZWZQ dHI8Q2hpbGRUeXBlPiBhdHRhY2goTm9kZSogcGFyZW50LCBQYXNzUmVmUHRyPENoaWxkVHlwZT4g cHJwQ2hpbGQpCiAgICAgewo=