44588 2010-08-24 23:26:55 -0700 Remove more DTD junk now that the LegacyHTMLDocumentParser is gone 2010-08-24 23:57:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric eric abarth oldest_to_newest 269044 0 eric 2010-08-24 23:26:55 -0700 Remove more DTD junk now that the LegacyHTMLDocumentParser is gone 269045 1 65376 eric 2010-08-24 23:27:41 -0700 Created attachment 65376 Patch 269046 2 65376 abarth 2010-08-24 23:29:39 -0700 Comment on attachment 65376 Patch Dead code: begone. 269056 3 eric 2010-08-24 23:57:25 -0700 Committed r65990: <http://trac.webkit.org/changeset/65990> 65376 2010-08-24 23:27:41 -0700 2010-08-24 23:29:39 -0700 Patch bug-44588-20100824232740.patch text/plain 11039 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YTBkYjVlYzQyYTM4NDcxZmVkNzlhNGQxOWI4YWEzODRjYmZlYjBmYi4uYjQxZWY3YWZlZGQ1NmFi N2E1MDAyNTU1OTUwZGJhNjJhOTVjMmY0OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wOC0yNCAgRXJp YyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIG1vcmUgRFREIGp1bmsgbm93IHRoYXQgdGhlIExl Z2FjeUhUTUxEb2N1bWVudFBhcnNlciBpcyBnb25lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDU4OAorCisgICAgICAgIEp1c3QgcmVtb3ZpbmcgZGVh ZCBjb2RlLCB0aHVzIG5vIHRlc3RzLgorCisgICAgICAgICogaHRtbC9IVE1MRWxlbWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpIVE1MRWxlbWVudDo6bm9kZU5hbWUpOgorICAgICAgICAqIGh0 bWwvSFRNTEVsZW1lbnQuaDoKKwogMjAxMC0wOC0yNCAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJr aXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5j cHAKaW5kZXggZTA1NWEzZWRiY2MyNTczYWM1YWI2NmU1ZTk4YjRkMzQ1YWU2OTBjZi4uYmU2YmRk Y2Q1YTI4MjQ2OTUxZTUxYzcwMzNkZGVmYzBiNzFmM2UwMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9o dG1sL0hUTUxFbGVtZW50LmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuY3BwCkBA IC02MSw4ICs2MSw4IEBAIFBhc3NSZWZQdHI8SFRNTEVsZW1lbnQ+IEhUTUxFbGVtZW50OjpjcmVh dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFtZSwgRG9jdW1lCiAKIFN0cmluZyBIVE1MRWxl bWVudDo6bm9kZU5hbWUoKSBjb25zdAogewotICAgIC8vIEZJWE1FOiBXb3VsZCBiZSBuaWNlIHRv IGhhdmUgYW4gYXRvbWljc3RyaW5nIGxvb2t1cCBiYXNlZCBvZmYgdXBwZXJjYXNlIGNoYXJzIHRo YXQgZG9lcyBub3QgaGF2ZSB0byBjb3B5Ci0gICAgLy8gdGhlIHN0cmluZyBvbiBhIGhpdCBpbiB0 aGUgaGFzaC4KKyAgICAvLyBGSVhNRTogV291bGQgYmUgbmljZSB0byBoYXZlIGFuIGF0b21pY3N0 cmluZyBsb29rdXAgYmFzZWQgb2ZmIHVwcGVyY2FzZQorICAgIC8vIGNoYXJzIHRoYXQgZG9lcyBu b3QgaGF2ZSB0byBjb3B5IHRoZSBzdHJpbmcgb24gYSBoaXQgaW4gdGhlIGhhc2guCiAgICAgLy8g RklYTUU6IFdlIHNob3VsZCBoYXZlIGEgd2F5IHRvIGRldGVjdCBYSFRNTCBlbGVtZW50cyBhbmQg cmVwbGFjZSB0aGUgaGFzUHJlZml4KCkgY2hlY2sgd2l0aCBpdC4KICAgICBpZiAoZG9jdW1lbnQo KS0+aXNIVE1MRG9jdW1lbnQoKSAmJiAhdGFnUU5hbWUoKS5oYXNQcmVmaXgoKSkKICAgICAgICAg cmV0dXJuIHRhZ1FOYW1lKCkubG9jYWxOYW1lVXBwZXIoKTsKQEAgLTc1MywyMDcgKzc1Myw2IEBA IFBhc3NSZWZQdHI8SFRNTENvbGxlY3Rpb24+IEhUTUxFbGVtZW50OjpjaGlsZHJlbigpCiAgICAg cmV0dXJuIEhUTUxDb2xsZWN0aW9uOjpjcmVhdGUodGhpcywgTm9kZUNoaWxkcmVuKTsKIH0KIAot Ly8gRFREIFN0dWZmCi0vLyBUaGlzIHVuZm9ydHVuYXRlIGZ1bmN0aW9uIGlzIG9ubHkgbmVlZGVk IHdoZW4gY2hlY2tpbmcgYWdhaW5zdCB0aGUgRFRELiAgT3RoZXIgbGFuZ3VhZ2VzIChsaWtlIFNW Rykgd29uJ3QgbmVlZCB0aGlzLgotLy8gRklYTUU6IFJlbW92ZSBpZiBvbmx5IHVzZWQgYnkgTGVn YWN5SFRNTFRyZWVCdWlsZGVyLgotYm9vbCBIVE1MRWxlbWVudDo6aXNSZWNvZ25pemVkVGFnTmFt ZShjb25zdCBRdWFsaWZpZWROYW1lJiB0YWdOYW1lKQotewotICAgIERFRklORV9TVEFUSUNfTE9D QUwoSGFzaFNldDxBdG9taWNTdHJpbmdJbXBsKj4sIHRhZ0xpc3QsICgpKTsKLSAgICBpZiAodGFn TGlzdC5pc0VtcHR5KCkpIHsKLSAgICAgICAgc2l6ZV90IHRhZ0NvdW50ID0gMDsKLSAgICAgICAg V2ViQ29yZTo6UXVhbGlmaWVkTmFtZSoqIHRhZ3MgPSBIVE1MTmFtZXM6OmdldEhUTUxUYWdzKCZ0 YWdDb3VudCk7Ci0gICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgdGFnQ291bnQ7IGkrKykg ewotICAgICAgICAgICAgaWYgKCp0YWdzW2ldID09IGJnc291bmRUYWcKLSAgICAgICAgICAgICAg ICB8fCAqdGFnc1tpXSA9PSBjb21tYW5kVGFnCi0gICAgICAgICAgICAgICAgfHwgKnRhZ3NbaV0g PT0gZGV0YWlsc1RhZwotICAgICAgICAgICAgICAgIHx8ICp0YWdzW2ldID09IGZpZ2NhcHRpb25U YWcKLSAgICAgICAgICAgICAgICB8fCAqdGFnc1tpXSA9PSBmaWd1cmVUYWcKLSAgICAgICAgICAg ICAgICB8fCAqdGFnc1tpXSA9PSBzdW1tYXJ5VGFnCi0gICAgICAgICAgICAgICAgfHwgKnRhZ3Nb aV0gPT0gdHJhY2tUYWcpIHsKLSAgICAgICAgICAgICAgICAvLyBFdmVuIHRob3VnaCB3ZSBoYXZl IGF0b21zIGZvciB0aGVzZSB0YWdzLCB3ZSBkb24ndCB3YW50IHRvCi0gICAgICAgICAgICAgICAg Ly8gdHJlYXQgdGhlbSBhcyAicmVjb2duaXplZCB0YWdzIiBmb3IgdGhlIHB1cnBvc2Ugb2YgcGFy c2luZwotICAgICAgICAgICAgICAgIC8vIGJlY2F1c2UgdGhhdCBjaGFuZ2VzIGhvdyB3ZSBwYXJz ZSBkb2N1bWVudHMuCi0gICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICB9Ci0g ICAgICAgICAgICB0YWdMaXN0LmFkZCh0YWdzW2ldLT5sb2NhbE5hbWUoKS5pbXBsKCkpOwotICAg ICAgICB9Ci0gICAgfQotICAgIHJldHVybiB0YWdMaXN0LmNvbnRhaW5zKHRhZ05hbWUubG9jYWxO YW1lKCkuaW1wbCgpKTsKLX0KLQotLy8gVGhlIHRlcm1zIGlubGluZSBhbmQgYmxvY2sgYXJlIHVz ZWQgaGVyZSBsb29zZWx5LiAgRG9uJ3QgbWFrZSB0aGUgbWlzdGFrZSBvZiBhc3N1bWluZyBhbGwg aW5saW5lcyBvciBhbGwgYmxvY2tzCi0vLyBuZWVkIHRvIGJlIGluIHRoZXNlIHR3byBsaXN0cy4K LXN0YXRpYyBIYXNoU2V0PEF0b21pY1N0cmluZ0ltcGwqPiogaW5saW5lVGFnTGlzdCgpCi17Ci0g ICAgREVGSU5FX1NUQVRJQ19MT0NBTChIYXNoU2V0PEF0b21pY1N0cmluZ0ltcGwqPiwgdGFnTGlz dCwgKCkpOwotICAgIGlmICh0YWdMaXN0LmlzRW1wdHkoKSkgewotICAgICAgICB0YWdMaXN0LmFk ZCh0dFRhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwotICAgICAgICB0YWdMaXN0LmFkZChpVGFnLmxv Y2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKGJUYWcubG9jYWxOYW1lKCku aW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQodVRhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwot ICAgICAgICB0YWdMaXN0LmFkZChzVGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAgIHRh Z0xpc3QuYWRkKHN0cmlrZVRhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwotICAgICAgICB0YWdMaXN0 LmFkZChiaWdUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQoc21h bGxUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQoZW1UYWcubG9j YWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQoc3Ryb25nVGFnLmxvY2FsTmFt ZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKGRmblRhZy5sb2NhbE5hbWUoKS5pbXBs KCkpOwotICAgICAgICB0YWdMaXN0LmFkZChjb2RlVGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0g ICAgICAgIHRhZ0xpc3QuYWRkKHNhbXBUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAg dGFnTGlzdC5hZGQoa2JkVGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xpc3Qu YWRkKHZhclRhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwotICAgICAgICB0YWdMaXN0LmFkZChjaXRl VGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKGFiYnJUYWcubG9j YWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQoYWNyb255bVRhZy5sb2NhbE5h bWUoKS5pbXBsKCkpOwotICAgICAgICB0YWdMaXN0LmFkZChhVGFnLmxvY2FsTmFtZSgpLmltcGwo KSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKGNhbnZhc1RhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwot ICAgICAgICB0YWdMaXN0LmFkZChpbWdUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAg dGFnTGlzdC5hZGQoYXBwbGV0VGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xp c3QuYWRkKG9iamVjdFRhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwotICAgICAgICB0YWdMaXN0LmFk ZChlbWJlZFRhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwotICAgICAgICB0YWdMaXN0LmFkZChmb250 VGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKGJhc2Vmb250VGFn LmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKGJyVGFnLmxvY2FsTmFt ZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKHNjcmlwdFRhZy5sb2NhbE5hbWUoKS5p bXBsKCkpOwotICAgICAgICB0YWdMaXN0LmFkZChzdHlsZVRhZy5sb2NhbE5hbWUoKS5pbXBsKCkp OwotICAgICAgICB0YWdMaXN0LmFkZChsaW5rVGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0gICAg ICAgIHRhZ0xpc3QuYWRkKG1hcFRhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwotICAgICAgICB0YWdM aXN0LmFkZChxVGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKHN1 YlRhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwotICAgICAgICB0YWdMaXN0LmFkZChzdXBUYWcubG9j YWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQoc3BhblRhZy5sb2NhbE5hbWUo KS5pbXBsKCkpOwotICAgICAgICB0YWdMaXN0LmFkZChiZG9UYWcubG9jYWxOYW1lKCkuaW1wbCgp KTsKLSAgICAgICAgdGFnTGlzdC5hZGQoaWZyYW1lVGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0g ICAgICAgIHRhZ0xpc3QuYWRkKGlucHV0VGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAg IHRhZ0xpc3QuYWRkKGtleWdlblRhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwotICAgICAgICB0YWdM aXN0LmFkZChzZWxlY3RUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5h ZGQoZGF0YWdyaWRUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQo dGV4dGFyZWFUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQobGFi ZWxUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQoYnV0dG9uVGFn LmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKGRhdGFsaXN0VGFnLmxv Y2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKGluc1RhZy5sb2NhbE5hbWUo KS5pbXBsKCkpOwotICAgICAgICB0YWdMaXN0LmFkZChkZWxUYWcubG9jYWxOYW1lKCkuaW1wbCgp KTsKLSAgICAgICAgdGFnTGlzdC5hZGQobm9iclRhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwotICAg ICAgICB0YWdMaXN0LmFkZCh3YnJUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSNpZiBFTkFCTEUo VklERU8pCi0gICAgICAgIHRhZ0xpc3QuYWRkKGF1ZGlvVGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7 Ci0gICAgICAgIHRhZ0xpc3QuYWRkKHZpZGVvVGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0jZW5k aWYKLSAgICAgICAgdGFnTGlzdC5hZGQocnBUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAg ICAgdGFnTGlzdC5hZGQocnRUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlz dC5hZGQocnVieVRhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwotICAgICAgICB0YWdMaXN0LmFkZChw cm9ncmVzc1RhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwotICAgICAgICB0YWdMaXN0LmFkZChtZXRl clRhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwotICAgICAgICB0YWdMaXN0LmFkZChtYXJrVGFnLmxv Y2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgfQotICAgIHJldHVybiAmdGFnTGlzdDsKLX0KLQotc3Rh dGljIEhhc2hTZXQ8QXRvbWljU3RyaW5nSW1wbCo+KiBibG9ja1RhZ0xpc3QoKQotewotICAgIERF RklORV9TVEFUSUNfTE9DQUwoSGFzaFNldDxBdG9taWNTdHJpbmdJbXBsKj4sIHRhZ0xpc3QsICgp KTsKLSAgICBpZiAodGFnTGlzdC5pc0VtcHR5KCkpIHsKLSAgICAgICAgdGFnTGlzdC5hZGQoYWRk cmVzc1RhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwotICAgICAgICB0YWdMaXN0LmFkZChhcnRpY2xl VGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKGFzaWRlVGFnLmxv Y2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKGJsb2NrcXVvdGVUYWcubG9j YWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQoY2VudGVyVGFnLmxvY2FsTmFt ZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKGRkVGFnLmxvY2FsTmFtZSgpLmltcGwo KSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKGRpclRhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwotICAg ICAgICB0YWdMaXN0LmFkZChkaXZUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFn TGlzdC5hZGQoZGxUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQo ZHRUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQoZmllbGRzZXRU YWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQoZm9vdGVyVGFnLmxv Y2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKGZvcm1UYWcubG9jYWxOYW1l KCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQoaDFUYWcubG9jYWxOYW1lKCkuaW1wbCgp KTsKLSAgICAgICAgdGFnTGlzdC5hZGQoaDJUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAg ICAgdGFnTGlzdC5hZGQoaDNUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlz dC5hZGQoaDRUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQoaDVU YWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQoaDZUYWcubG9jYWxO YW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQoaGVhZGVyVGFnLmxvY2FsTmFtZSgp LmltcGwoKSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKGhncm91cFRhZy5sb2NhbE5hbWUoKS5pbXBs KCkpOwotICAgICAgICB0YWdMaXN0LmFkZChoclRhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwotICAg ICAgICB0YWdMaXN0LmFkZChpc2luZGV4VGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAg IHRhZ0xpc3QuYWRkKGxheWVyVGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xp c3QuYWRkKGxpVGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKGxp c3RpbmdUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQobWFycXVl ZVRhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwotICAgICAgICB0YWdMaXN0LmFkZChtZW51VGFnLmxv Y2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKG5hdlRhZy5sb2NhbE5hbWUo KS5pbXBsKCkpOwotICAgICAgICB0YWdMaXN0LmFkZChub2VtYmVkVGFnLmxvY2FsTmFtZSgpLmlt cGwoKSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKG5vZnJhbWVzVGFnLmxvY2FsTmFtZSgpLmltcGwo KSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKG5vbGF5ZXJUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsK LSAgICAgICAgdGFnTGlzdC5hZGQobm9zY3JpcHRUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAg ICAgICAgdGFnTGlzdC5hZGQob2xUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFn TGlzdC5hZGQocFRhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwotICAgICAgICB0YWdMaXN0LmFkZChw bGFpbnRleHRUYWcubG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQocHJl VGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAgIHRhZ0xpc3QuYWRkKHNlY3Rpb25UYWcu bG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQodGFibGVUYWcubG9jYWxO YW1lKCkuaW1wbCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQodWxUYWcubG9jYWxOYW1lKCkuaW1w bCgpKTsKLSAgICAgICAgdGFnTGlzdC5hZGQoeG1wVGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7Ci0g ICAgfQotICAgIHJldHVybiAmdGFnTGlzdDsKLX0KLQotYm9vbCBIVE1MRWxlbWVudDo6aW5FaXRo ZXJUYWdMaXN0KGNvbnN0IE5vZGUqIG5ld0NoaWxkKQotewotICAgIGlmIChuZXdDaGlsZC0+aXNU ZXh0Tm9kZSgpKQotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgCi0gICAgaWYgKG5ld0No aWxkLT5pc0hUTUxFbGVtZW50KCkpIHsKLSAgICAgICAgY29uc3QgSFRNTEVsZW1lbnQqIGNoaWxk ID0gc3RhdGljX2Nhc3Q8Y29uc3QgSFRNTEVsZW1lbnQqPihuZXdDaGlsZCk7Ci0gICAgICAgIGlm IChpbmxpbmVUYWdMaXN0KCktPmNvbnRhaW5zKGNoaWxkLT50YWdRTmFtZSgpLmxvY2FsTmFtZSgp LmltcGwoKSkpIHsKLSNpZiBQTEFURk9STShNQUMpCi0gICAgICAgICAgICBpZiAoY2hpbGQtPnRh Z1FOYW1lKCkubG9jYWxOYW1lKCkgPT0gc3R5bGVUYWcpIHsKLSAgICAgICAgICAgICAgICAvLyBM ZW9wYXJkIE1haWwgZG9lc24ndCBleHBlY3QgPHN0eWxlPiB0byBiZSBpbiB0aGUgYm9keSBvZiB0 aGUgZG9jdW1lbnQsIHNvIGRvbid0IGFsbG93IGl0IGluIHRoYXQgY2FzZS4KLSAgICAgICAgICAg ICAgICAvLyBTZWUgPHJkYXI6Ly9wcm9ibGVtLzY2MjEzMTA+Ci0gICAgICAgICAgICAgICAgU2V0 dGluZ3MqIHNldHRpbmdzID0gbmV3Q2hpbGQtPmRvY3VtZW50KCkgPyBuZXdDaGlsZC0+ZG9jdW1l bnQoKS0+c2V0dGluZ3MoKSA6IDA7Ci0gICAgICAgICAgICAgICAgaWYgKHNldHRpbmdzICYmIHNl dHRpbmdzLT5uZWVkc0xlb3BhcmRNYWlsUXVpcmtzKCkpCi0gICAgICAgICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKLSAgICAgICAgICAgIH0KLSNlbmRpZgotICAgICAgICAgICAgcmV0dXJuIHRy dWU7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKGJsb2NrVGFnTGlzdCgpLT5jb250YWlucyhjaGls ZC0+dGFnUU5hbWUoKS5sb2NhbE5hbWUoKS5pbXBsKCkpKQotICAgICAgICAgICAgcmV0dXJuIHRy dWU7Ci0gICAgICAgIHJldHVybiAhaXNSZWNvZ25pemVkVGFnTmFtZShjaGlsZC0+dGFnUU5hbWUo KSk7IC8vIEFjY2VwdCBjdXN0b20gaHRtbCB0YWdzCi0gICAgfQotCi0gICAgcmV0dXJuIGZhbHNl OwotfQotCi1ib29sIEhUTUxFbGVtZW50OjppbklubGluZVRhZ0xpc3QoY29uc3QgTm9kZSogbmV3 Q2hpbGQpCi17Ci0gICAgaWYgKG5ld0NoaWxkLT5pc1RleHROb2RlKCkpCi0gICAgICAgIHJldHVy biB0cnVlOwotCi0gICAgaWYgKG5ld0NoaWxkLT5pc0hUTUxFbGVtZW50KCkpIHsKLSAgICAgICAg Y29uc3QgSFRNTEVsZW1lbnQqIGNoaWxkID0gc3RhdGljX2Nhc3Q8Y29uc3QgSFRNTEVsZW1lbnQq PihuZXdDaGlsZCk7Ci0gICAgICAgIGlmIChpbmxpbmVUYWdMaXN0KCktPmNvbnRhaW5zKGNoaWxk LT50YWdRTmFtZSgpLmxvY2FsTmFtZSgpLmltcGwoKSkpCi0gICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKLSAgICAgICAgcmV0dXJuICFpc1JlY29nbml6ZWRUYWdOYW1lKGNoaWxkLT50YWdRTmFtZSgp KTsgLy8gQWNjZXB0IGN1c3RvbSBodG1sIHRhZ3MKLSAgICB9Ci0KLSAgICByZXR1cm4gZmFsc2U7 Ci19Ci0KLWJvb2wgSFRNTEVsZW1lbnQ6OmluQmxvY2tUYWdMaXN0KGNvbnN0IE5vZGUqIG5ld0No aWxkKQotewotICAgIGlmIChuZXdDaGlsZC0+aXNUZXh0Tm9kZSgpKQotICAgICAgICByZXR1cm4g dHJ1ZTsKLSAgICAgICAgICAgIAotICAgIGlmIChuZXdDaGlsZC0+aXNIVE1MRWxlbWVudCgpKSB7 Ci0gICAgICAgIGNvbnN0IEhUTUxFbGVtZW50KiBjaGlsZCA9IHN0YXRpY19jYXN0PGNvbnN0IEhU TUxFbGVtZW50Kj4obmV3Q2hpbGQpOwotICAgICAgICByZXR1cm4gKGJsb2NrVGFnTGlzdCgpLT5j b250YWlucyhjaGlsZC0+dGFnUU5hbWUoKS5sb2NhbE5hbWUoKS5pbXBsKCkpKTsKLSAgICB9Ci0K LSAgICByZXR1cm4gZmFsc2U7Ci19Ci0KIGJvb2wgSFRNTEVsZW1lbnQ6OnJlbmRlcmVySXNOZWVk ZWQoUmVuZGVyU3R5bGUgKnN0eWxlKQogewogI2lmICFFTkFCTEUoWEhUTUxNUCkKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5oIGIvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50 LmgKaW5kZXggZTFiNTZhMGEyYmM4NDc1ODk2NzYyOGJkMTFiMWY4YTA0YzNiZjZkMS4uNWYwOGQz OGRlZDM2NmY3NzRlZjNjYzI0NGU2MjUxZmY5M2IzNGE5MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9o dG1sL0hUTUxFbGVtZW50LmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmgKQEAgLTg5 LDExICs4OSw2IEBAIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIGJvb2wgbWFwVG9FbnRyeShjb25z dCBRdWFsaWZpZWROYW1lJiBhdHRyTmFtZSwgTWFwcGVkQXR0cmlidXRlRW50cnkmIHJlc3VsdCkg Y29uc3Q7CiAgICAgdmlydHVhbCB2b2lkIHBhcnNlTWFwcGVkQXR0cmlidXRlKEF0dHJpYnV0ZSop OwogCi0gICAgc3RhdGljIGJvb2wgaW5FaXRoZXJUYWdMaXN0KGNvbnN0IE5vZGUqKTsKLSAgICBz dGF0aWMgYm9vbCBpbklubGluZVRhZ0xpc3QoY29uc3QgTm9kZSopOwotICAgIHN0YXRpYyBib29s IGluQmxvY2tUYWdMaXN0KGNvbnN0IE5vZGUqKTsKLSAgICBzdGF0aWMgYm9vbCBpc1JlY29nbml6 ZWRUYWdOYW1lKGNvbnN0IFF1YWxpZmllZE5hbWUmKTsKLQogICAgIEhUTUxGb3JtRWxlbWVudCog ZmluZEZvcm1BbmNlc3RvcigpIGNvbnN0OwogCiBwcml2YXRlOgo=