193410 2019-01-14 14:35:16 -0800 Remove redundant check for alignAttr and hiddenAttr in various isPresentationAttribute overrides 2019-01-14 14:52:28 -0800 1 1 1 Unclassified WebKit DOM WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa cdumez simon.fraser webkit-bug-importer zalan oldest_to_newest 1494321 0 rniwa 2019-01-14 14:35:16 -0800 HTMLElement::isPresentationAttribute checks for alignAttr and hiddenAttr. There is no need to check them in HTMLElement's subclasses' isPresentationAttribute 1494322 1 359081 rniwa 2019-01-14 14:37:38 -0800 Created attachment 359081 Cleanup 1494323 2 359082 rniwa 2019-01-14 14:40:31 -0800 Created attachment 359082 Cleanup 1494327 3 rniwa 2019-01-14 14:51:58 -0800 Committed r239952: <https://trac.webkit.org/changeset/239952> 1494329 4 webkit-bug-importer 2019-01-14 14:52:28 -0800 <rdar://problem/47266787> 359081 2019-01-14 14:37:38 -0800 2019-01-14 14:40:30 -0800 Cleanup bug-193410-20190114143737.patch text/plain 11940 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzOTk1MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBACisyMDE5LTAxLTE0ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbW92ZSByZWR1bmRhbnQgY2hl Y2sgZm9yIGFsaWduQXR0ciBhbmQgaGlkZGVuQXR0ciBpbiB2YXJpb3VzIGlzUHJlc2VudGF0aW9u QXR0cmlidXRlIG92ZXJyaWRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTkzNDEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUmVtb3ZlZCByZWR1bmRhbnQgY2hlY2tzIGZvciBjaGVjayBmb3IgYWxpZ25B dHRyIGFuZCBoaWRkZW5BdHRyIGluIGlzUHJlc2VudGF0aW9uQXR0cmlidXRlIG92ZXJyaWRlcwor CWluIEhUTUxFbGVtZW50IHN1YmNsYXNzZXMgc2luY2UgSFRNTEVsZW1lbnQ6OmlzUHJlc2VudGF0 aW9uQXR0cmlidXRlIGFscmVhZHkgY2hlY2tzIGZvciB0aG9zZSBhdHRyaWJ1dGVzLgorCisgICAg ICAgICogaHRtbC9IVE1MRGl2RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRGl2 RWxlbWVudDo6aXNQcmVzZW50YXRpb25BdHRyaWJ1dGUgY29uc3QpOiBEZWxldGVkLgorICAgICAg ICAqIGh0bWwvSFRNTERpdkVsZW1lbnQuaDoKKyAgICAgICAgKiBodG1sL0hUTUxFbWJlZEVsZW1l bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEVtYmVkRWxlbWVudDo6aXNQcmVzZW50YXRp b25BdHRyaWJ1dGUgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGh0bWwvSFRNTEVtYmVkRWxl bWVudC5oOgorICAgICAgICAqIGh0bWwvSFRNTEhSRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpIVE1MSFJFbGVtZW50Ojppc1ByZXNlbnRhdGlvbkF0dHJpYnV0ZSBjb25zdCk6CisgICAg ICAgICogaHRtbC9IVE1MSUZyYW1lRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1M SUZyYW1lRWxlbWVudDo6aXNQcmVzZW50YXRpb25BdHRyaWJ1dGUgY29uc3QpOgorICAgICAgICAq IGh0bWwvSFRNTEltYWdlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VF bGVtZW50Ojppc1ByZXNlbnRhdGlvbkF0dHJpYnV0ZSBjb25zdCk6CisgICAgICAgICogaHRtbC9I VE1MSW5wdXRFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbnB1dEVsZW1lbnQ6 OmlzUHJlc2VudGF0aW9uQXR0cmlidXRlIGNvbnN0KToKKyAgICAgICAgKiBodG1sL0hUTUxQYXJh Z3JhcGhFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQYXJhZ3JhcGhFbGVtZW50 Ojppc1ByZXNlbnRhdGlvbkF0dHJpYnV0ZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogaHRt bC9IVE1MUGFyYWdyYXBoRWxlbWVudC5oOgorICAgICAgICAqIGh0bWwvSFRNTFRhYmxlQ2FwdGlv bkVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRhYmxlQ2FwdGlvbkVsZW1lbnQ6 OmlzUHJlc2VudGF0aW9uQXR0cmlidXRlIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBodG1s L0hUTUxUYWJsZUNhcHRpb25FbGVtZW50Lmg6CisgICAgICAgICogaHRtbC9IVE1MVGFibGVFbGVt ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUYWJsZUVsZW1lbnQ6OmlzUHJlc2VudGF0 aW9uQXR0cmlidXRlIGNvbnN0KToKKyAgICAgICAgKiBodG1sL0hUTUxUYWJsZVBhcnRFbGVtZW50 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUYWJsZVBhcnRFbGVtZW50Ojppc1ByZXNlbnRh dGlvbkF0dHJpYnV0ZSBjb25zdCk6CisKIDIwMTktMDEtMTQgIENvbW1pdCBRdWV1ZSAgPGNvbW1p dC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIy Mzk5MDEsIHIyMzk5MDksIHIyMzk5MTAsIHIyMzk5MTIsCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxEaXZFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxEaXZFbGVtZW50LmNwcAkocmV2aXNpb24gMjM5OTQzKQorKysgU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MRGl2RWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUwLDEzICs1MCw2IEBA IFJlZjxIVE1MRGl2RWxlbWVudD4gSFRNTERpdkVsZW1lbnQ6OmNyZWEKICAgICByZXR1cm4gYWRv cHRSZWYoKm5ldyBIVE1MRGl2RWxlbWVudCh0YWdOYW1lLCBkb2N1bWVudCkpOwogfQogCi1ib29s IEhUTUxEaXZFbGVtZW50Ojppc1ByZXNlbnRhdGlvbkF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWRO YW1lJiBuYW1lKSBjb25zdAotewotICAgIGlmIChuYW1lID09IGFsaWduQXR0cikKLSAgICAgICAg cmV0dXJuIHRydWU7Ci0gICAgcmV0dXJuIEhUTUxFbGVtZW50Ojppc1ByZXNlbnRhdGlvbkF0dHJp YnV0ZShuYW1lKTsKLX0KLQogdm9pZCBIVE1MRGl2RWxlbWVudDo6Y29sbGVjdFN0eWxlRm9yUHJl c2VudGF0aW9uQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUsIGNvbnN0IEF0b21p Y1N0cmluZyYgdmFsdWUsIE11dGFibGVTdHlsZVByb3BlcnRpZXMmIHN0eWxlKQogewogICAgIGlm IChuYW1lID09IGFsaWduQXR0cikgewpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRGl2 RWxlbWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTERpdkVsZW1l bnQuaAkocmV2aXNpb24gMjM5OTQzKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRGl2RWxl bWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw3ICszNiw2IEBAIHByb3RlY3RlZDoKICAgICBI VE1MRGl2RWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiwgRG9jdW1lbnQmKTsKIAogcHJpdmF0 ZToKLSAgICBib29sIGlzUHJlc2VudGF0aW9uQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUm KSBjb25zdCBmaW5hbDsKICAgICB2b2lkIGNvbGxlY3RTdHlsZUZvclByZXNlbnRhdGlvbkF0dHJp YnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiwgY29uc3QgQXRvbWljU3RyaW5nJiwgTXV0YWJsZVN0 eWxlUHJvcGVydGllcyYpIGZpbmFsOwogfTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MRW1iZWRFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxFbWJlZEVsZW1lbnQuY3BwCShyZXZpc2lvbiAyMzk5NDMpCisrKyBTb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxFbWJlZEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05MCwxMyArOTAsNiBA QCBSZW5kZXJXaWRnZXQqIEhUTUxFbWJlZEVsZW1lbnQ6OnJlbmRlcldpCiAgICAgcmV0dXJuIGZp bmRXaWRnZXRSZW5kZXJlcih0aGlzKTsKIH0KIAotYm9vbCBIVE1MRW1iZWRFbGVtZW50Ojppc1By ZXNlbnRhdGlvbkF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lKSBjb25zdAotewot ICAgIGlmIChuYW1lID09IGhpZGRlbkF0dHIpCi0gICAgICAgIHJldHVybiB0cnVlOwotICAgIHJl dHVybiBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50Ojppc1ByZXNlbnRhdGlvbkF0dHJpYnV0ZShuYW1l KTsKLX0KLQogdm9pZCBIVE1MRW1iZWRFbGVtZW50Ojpjb2xsZWN0U3R5bGVGb3JQcmVzZW50YXRp b25BdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSwgY29uc3QgQXRvbWljU3RyaW5n JiB2YWx1ZSwgTXV0YWJsZVN0eWxlUHJvcGVydGllcyYgc3R5bGUpCiB7CiAgICAgaWYgKG5hbWUg PT0gaGlkZGVuQXR0cikgewpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRW1iZWRFbGVt ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRW1iZWRFbGVtZW50 LmgJKHJldmlzaW9uIDIzOTk0MykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVtYmVkRWxl bWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw3ICszNiw2IEBAIHByaXZhdGU6CiAgICAgSFRN TEVtYmVkRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiwgRG9jdW1lbnQmKTsKIAogICAgIHZv aWQgcGFyc2VBdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYsIGNvbnN0IEF0b21pY1N0cmlu ZyYpIGZpbmFsOwotICAgIGJvb2wgaXNQcmVzZW50YXRpb25BdHRyaWJ1dGUoY29uc3QgUXVhbGlm aWVkTmFtZSYpIGNvbnN0IGZpbmFsOwogICAgIHZvaWQgY29sbGVjdFN0eWxlRm9yUHJlc2VudGF0 aW9uQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmLCBjb25zdCBBdG9taWNTdHJpbmcmLCBN dXRhYmxlU3R5bGVQcm9wZXJ0aWVzJikgZmluYWw7CiAKICAgICBib29sIHJlbmRlcmVySXNOZWVk ZWQoY29uc3QgUmVuZGVyU3R5bGUmKSBmaW5hbDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTEhSRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M SFJFbGVtZW50LmNwcAkocmV2aXNpb24gMjM5OTQzKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MSFJFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTQsNyArNTQsNyBAQCBSZWY8SFRN TEhSRWxlbWVudD4gSFRNTEhSRWxlbWVudDo6Y3JlYXRlCiAKIGJvb2wgSFRNTEhSRWxlbWVudDo6 aXNQcmVzZW50YXRpb25BdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSkgY29uc3QK IHsKLSAgICBpZiAobmFtZSA9PSBhbGlnbkF0dHIgfHwgbmFtZSA9PSB3aWR0aEF0dHIgfHwgbmFt ZSA9PSBjb2xvckF0dHIgfHwgbmFtZSA9PSBub3NoYWRlQXR0ciB8fCBuYW1lID09IHNpemVBdHRy KQorICAgIGlmIChuYW1lID09IHdpZHRoQXR0ciB8fCBuYW1lID09IGNvbG9yQXR0ciB8fCBuYW1l ID09IG5vc2hhZGVBdHRyIHx8IG5hbWUgPT0gc2l6ZUF0dHIpCiAgICAgICAgIHJldHVybiB0cnVl OwogICAgIHJldHVybiBIVE1MRWxlbWVudDo6aXNQcmVzZW50YXRpb25BdHRyaWJ1dGUobmFtZSk7 CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJRnJhbWVFbGVtZW50LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJRnJhbWVFbGVtZW50LmNwcAkocmV2 aXNpb24gMjM5OTQzKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSUZyYW1lRWxlbWVudC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTYyLDcgKzYyLDcgQEAgRE9NVG9rZW5MaXN0JiBIVE1MSUZy YW1lRWxlbWVudDo6c2FuZGJveAogCiBib29sIEhUTUxJRnJhbWVFbGVtZW50Ojppc1ByZXNlbnRh dGlvbkF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lKSBjb25zdAogewotICAgIGlm IChuYW1lID09IHdpZHRoQXR0ciB8fCBuYW1lID09IGhlaWdodEF0dHIgfHwgbmFtZSA9PSBhbGln bkF0dHIgfHwgbmFtZSA9PSBmcmFtZWJvcmRlckF0dHIpCisgICAgaWYgKG5hbWUgPT0gd2lkdGhB dHRyIHx8IG5hbWUgPT0gaGVpZ2h0QXR0ciB8fCBuYW1lID09IGZyYW1lYm9yZGVyQXR0cikKICAg ICAgICAgcmV0dXJuIHRydWU7CiAgICAgcmV0dXJuIEhUTUxGcmFtZUVsZW1lbnRCYXNlOjppc1By ZXNlbnRhdGlvbkF0dHJpYnV0ZShuYW1lKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTEltYWdlRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MSW1hZ2VFbGVtZW50LmNwcAkocmV2aXNpb24gMjM5OTQzKQorKysgU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MSW1hZ2VFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE0LDcgKzExNCw3 IEBAIFJlZjxIVE1MSW1hZ2VFbGVtZW50PiBIVE1MSW1hZ2VFbGVtZW50OjoKIAogYm9vbCBIVE1M SW1hZ2VFbGVtZW50Ojppc1ByZXNlbnRhdGlvbkF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1l JiBuYW1lKSBjb25zdAogewotICAgIGlmIChuYW1lID09IHdpZHRoQXR0ciB8fCBuYW1lID09IGhl aWdodEF0dHIgfHwgbmFtZSA9PSBib3JkZXJBdHRyIHx8IG5hbWUgPT0gdnNwYWNlQXR0ciB8fCBu YW1lID09IGhzcGFjZUF0dHIgfHwgbmFtZSA9PSBhbGlnbkF0dHIgfHwgbmFtZSA9PSB2YWxpZ25B dHRyKQorICAgIGlmIChuYW1lID09IHdpZHRoQXR0ciB8fCBuYW1lID09IGhlaWdodEF0dHIgfHwg bmFtZSA9PSBib3JkZXJBdHRyIHx8IG5hbWUgPT0gdnNwYWNlQXR0ciB8fCBuYW1lID09IGhzcGFj ZUF0dHIgfHwgbmFtZSA9PSB2YWxpZ25BdHRyKQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICBy ZXR1cm4gSFRNTEVsZW1lbnQ6OmlzUHJlc2VudGF0aW9uQXR0cmlidXRlKG5hbWUpOwogfQpJbmRl eDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwCShyZXZpc2lvbiAyMzk5 NDMpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC02NDUsNyArNjQ1LDcgQEAgdm9pZCBIVE1MSW5wdXRFbGVtZW50OjphY2Nlc3NL ZXlBY3Rpb24oYgogCiBib29sIEhUTUxJbnB1dEVsZW1lbnQ6OmlzUHJlc2VudGF0aW9uQXR0cmli dXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUpIGNvbnN0CiB7Ci0gICAgaWYgKG5hbWUgPT0g dnNwYWNlQXR0ciB8fCBuYW1lID09IGhzcGFjZUF0dHIgfHwgbmFtZSA9PSBhbGlnbkF0dHIgfHwg bmFtZSA9PSB3aWR0aEF0dHIgfHwgbmFtZSA9PSBoZWlnaHRBdHRyIHx8IChuYW1lID09IGJvcmRl ckF0dHIgJiYgaXNJbWFnZUJ1dHRvbigpKSkKKyAgICBpZiAobmFtZSA9PSB2c3BhY2VBdHRyIHx8 IG5hbWUgPT0gaHNwYWNlQXR0ciB8fCBuYW1lID09IHdpZHRoQXR0ciB8fCBuYW1lID09IGhlaWdo dEF0dHIgfHwgKG5hbWUgPT0gYm9yZGVyQXR0ciAmJiBpc0ltYWdlQnV0dG9uKCkpKQogICAgICAg ICByZXR1cm4gdHJ1ZTsKICAgICByZXR1cm4gSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6Omlz UHJlc2VudGF0aW9uQXR0cmlidXRlKG5hbWUpOwogfQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MUGFyYWdyYXBoRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MUGFyYWdyYXBoRWxlbWVudC5jcHAJKHJldmlzaW9uIDIzOTk0MykKKysrIFNvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTFBhcmFncmFwaEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC01MSwxMyArNTEsNiBAQCBSZWY8SFRNTFBhcmFncmFwaEVsZW1lbnQ+IEhUTUxQYXJhZ3JhcGhF CiAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgSFRNTFBhcmFncmFwaEVsZW1lbnQodGFnTmFtZSwg ZG9jdW1lbnQpKTsKIH0KIAotYm9vbCBIVE1MUGFyYWdyYXBoRWxlbWVudDo6aXNQcmVzZW50YXRp b25BdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSkgY29uc3QKLXsKLSAgICBpZiAo bmFtZSA9PSBhbGlnbkF0dHIpCi0gICAgICAgIHJldHVybiB0cnVlOwotICAgIHJldHVybiBIVE1M RWxlbWVudDo6aXNQcmVzZW50YXRpb25BdHRyaWJ1dGUobmFtZSk7Ci19Ci0KIHZvaWQgSFRNTFBh cmFncmFwaEVsZW1lbnQ6OmNvbGxlY3RTdHlsZUZvclByZXNlbnRhdGlvbkF0dHJpYnV0ZShjb25z dCBRdWFsaWZpZWROYW1lJiBuYW1lLCBjb25zdCBBdG9taWNTdHJpbmcmIHZhbHVlLCBNdXRhYmxl U3R5bGVQcm9wZXJ0aWVzJiBzdHlsZSkKIHsKICAgICBpZiAobmFtZSA9PSBhbGlnbkF0dHIpIHsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBhcmFncmFwaEVsZW1lbnQuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQYXJhZ3JhcGhFbGVtZW50LmgJKHJldmlz aW9uIDIzOTk0MykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBhcmFncmFwaEVsZW1lbnQu aAkod29ya2luZyBjb3B5KQpAQCAtMzUsNyArMzUsNiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAg IEhUTUxQYXJhZ3JhcGhFbGVtZW50KGNvbnN0IFF1YWxpZmllZE5hbWUmLCBEb2N1bWVudCYpOwog Ci0gICAgYm9vbCBpc1ByZXNlbnRhdGlvbkF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJikg Y29uc3QgZmluYWw7CiAgICAgdm9pZCBjb2xsZWN0U3R5bGVGb3JQcmVzZW50YXRpb25BdHRyaWJ1 dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYsIGNvbnN0IEF0b21pY1N0cmluZyYsIE11dGFibGVTdHls ZVByb3BlcnRpZXMmKSBmaW5hbDsKIH07CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TFRhYmxlQ2FwdGlvbkVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTFRhYmxlQ2FwdGlvbkVsZW1lbnQuY3BwCShyZXZpc2lvbiAyMzk5NDMpCisrKyBTb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxUYWJsZUNhcHRpb25FbGVtZW50LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNDYsMTMgKzQ2LDYgQEAgUmVmPEhUTUxUYWJsZUNhcHRpb25FbGVtZW50PiBIVE1MVGFi bGVDYQogICAgIHJldHVybiBhZG9wdFJlZigqbmV3IEhUTUxUYWJsZUNhcHRpb25FbGVtZW50KHRh Z05hbWUsIGRvY3VtZW50KSk7CiB9CiAKLWJvb2wgSFRNTFRhYmxlQ2FwdGlvbkVsZW1lbnQ6Omlz UHJlc2VudGF0aW9uQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUpIGNvbnN0Ci17 Ci0gICAgaWYgKG5hbWUgPT0gYWxpZ25BdHRyKQotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICBy ZXR1cm4gSFRNTEVsZW1lbnQ6OmlzUHJlc2VudGF0aW9uQXR0cmlidXRlKG5hbWUpOwotfQotCiB2 b2lkIEhUTUxUYWJsZUNhcHRpb25FbGVtZW50Ojpjb2xsZWN0U3R5bGVGb3JQcmVzZW50YXRpb25B dHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSwgY29uc3QgQXRvbWljU3RyaW5nJiB2 YWx1ZSwgTXV0YWJsZVN0eWxlUHJvcGVydGllcyYgc3R5bGUpCiB7CiAgICAgaWYgKG5hbWUgPT0g YWxpZ25BdHRyKSB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUYWJsZUNhcHRpb25F bGVtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGFibGVDYXB0 aW9uRWxlbWVudC5oCShyZXZpc2lvbiAyMzk5NDMpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxUYWJsZUNhcHRpb25FbGVtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTM3LDcgKzM3LDYgQEAg cHVibGljOgogcHJpdmF0ZToKICAgICBIVE1MVGFibGVDYXB0aW9uRWxlbWVudChjb25zdCBRdWFs aWZpZWROYW1lJiwgRG9jdW1lbnQmKTsKIAotICAgIGJvb2wgaXNQcmVzZW50YXRpb25BdHRyaWJ1 dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0IGZpbmFsOwogICAgIHZvaWQgY29sbGVjdFN0 eWxlRm9yUHJlc2VudGF0aW9uQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmLCBjb25zdCBB dG9taWNTdHJpbmcmLCBNdXRhYmxlU3R5bGVQcm9wZXJ0aWVzJikgZmluYWw7CiB9OwogCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUYWJsZUVsZW1lbnQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRhYmxlRWxlbWVudC5jcHAJKHJldmlzaW9uIDIzOTk0 MykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRhYmxlRWxlbWVudC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTM2Myw3ICszNjMsNyBAQCB2b2lkIEhUTUxUYWJsZUVsZW1lbnQ6OmNvbGxlY3RT dHlsZUZvclByCiAKIGJvb2wgSFRNTFRhYmxlRWxlbWVudDo6aXNQcmVzZW50YXRpb25BdHRyaWJ1 dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSkgY29uc3QKIHsKLSAgICBpZiAobmFtZSA9PSB3 aWR0aEF0dHIgfHwgbmFtZSA9PSBoZWlnaHRBdHRyIHx8IG5hbWUgPT0gYmdjb2xvckF0dHIgfHwg bmFtZSA9PSBiYWNrZ3JvdW5kQXR0ciB8fCBuYW1lID09IHZhbGlnbkF0dHIgfHwgbmFtZSA9PSB2 c3BhY2VBdHRyIHx8IG5hbWUgPT0gaHNwYWNlQXR0ciB8fCBuYW1lID09IGFsaWduQXR0ciB8fCBu YW1lID09IGNlbGxzcGFjaW5nQXR0ciB8fCBuYW1lID09IGJvcmRlckF0dHIgfHwgbmFtZSA9PSBi b3JkZXJjb2xvckF0dHIgfHwgbmFtZSA9PSBmcmFtZUF0dHIgfHwgbmFtZSA9PSBydWxlc0F0dHIp CisgICAgaWYgKG5hbWUgPT0gd2lkdGhBdHRyIHx8IG5hbWUgPT0gaGVpZ2h0QXR0ciB8fCBuYW1l ID09IGJnY29sb3JBdHRyIHx8IG5hbWUgPT0gYmFja2dyb3VuZEF0dHIgfHwgbmFtZSA9PSB2YWxp Z25BdHRyIHx8IG5hbWUgPT0gdnNwYWNlQXR0ciB8fCBuYW1lID09IGhzcGFjZUF0dHIgfHwgbmFt ZSA9PSBjZWxsc3BhY2luZ0F0dHIgfHwgbmFtZSA9PSBib3JkZXJBdHRyIHx8IG5hbWUgPT0gYm9y ZGVyY29sb3JBdHRyIHx8IG5hbWUgPT0gZnJhbWVBdHRyIHx8IG5hbWUgPT0gcnVsZXNBdHRyKQog ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICByZXR1cm4gSFRNTEVsZW1lbnQ6OmlzUHJlc2VudGF0 aW9uQXR0cmlidXRlKG5hbWUpOwogfQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGFi bGVQYXJ0RWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M VGFibGVQYXJ0RWxlbWVudC5jcHAJKHJldmlzaW9uIDIzOTk0MykKKysrIFNvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTFRhYmxlUGFydEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Myw3ICs0 Myw3IEBAIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAKIGJvb2wgSFRNTFRhYmxlUGFydEVs ZW1lbnQ6OmlzUHJlc2VudGF0aW9uQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUp IGNvbnN0CiB7Ci0gICAgaWYgKG5hbWUgPT0gYmdjb2xvckF0dHIgfHwgbmFtZSA9PSBiYWNrZ3Jv dW5kQXR0ciB8fCBuYW1lID09IHZhbGlnbkF0dHIgfHwgbmFtZSA9PSBhbGlnbkF0dHIgfHwgbmFt ZSA9PSBoZWlnaHRBdHRyKQorICAgIGlmIChuYW1lID09IGJnY29sb3JBdHRyIHx8IG5hbWUgPT0g YmFja2dyb3VuZEF0dHIgfHwgbmFtZSA9PSB2YWxpZ25BdHRyIHx8IG5hbWUgPT0gaGVpZ2h0QXR0 cikKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgcmV0dXJuIEhUTUxFbGVtZW50Ojppc1ByZXNl bnRhdGlvbkF0dHJpYnV0ZShuYW1lKTsKIH0K 359082 2019-01-14 14:40:31 -0800 2019-01-14 14:45:45 -0800 Cleanup bug-193410-20190114144031.patch text/plain 11947 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzOTk1MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBACisyMDE5LTAxLTE0ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbW92ZSByZWR1bmRhbnQgY2hl Y2sgZm9yIGFsaWduQXR0ciBhbmQgaGlkZGVuQXR0ciBpbiB2YXJpb3VzIGlzUHJlc2VudGF0aW9u QXR0cmlidXRlIG92ZXJyaWRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTkzNDEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUmVtb3ZlZCByZWR1bmRhbnQgY2hlY2tzIGZvciBjaGVjayBmb3IgYWxpZ25B dHRyIGFuZCBoaWRkZW5BdHRyIGluIGlzUHJlc2VudGF0aW9uQXR0cmlidXRlIG92ZXJyaWRlcwor ICAgICAgICBpbiBIVE1MRWxlbWVudCBzdWJjbGFzc2VzIHNpbmNlIEhUTUxFbGVtZW50Ojppc1By ZXNlbnRhdGlvbkF0dHJpYnV0ZSBhbHJlYWR5IGNoZWNrcyBmb3IgdGhvc2UgYXR0cmlidXRlcy4K KworICAgICAgICAqIGh0bWwvSFRNTERpdkVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTERpdkVsZW1lbnQ6OmlzUHJlc2VudGF0aW9uQXR0cmlidXRlIGNvbnN0KTogRGVsZXRlZC4K KyAgICAgICAgKiBodG1sL0hUTUxEaXZFbGVtZW50Lmg6CisgICAgICAgICogaHRtbC9IVE1MRW1i ZWRFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxFbWJlZEVsZW1lbnQ6OmlzUHJl c2VudGF0aW9uQXR0cmlidXRlIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBodG1sL0hUTUxF bWJlZEVsZW1lbnQuaDoKKyAgICAgICAgKiBodG1sL0hUTUxIUkVsZW1lbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTEhSRWxlbWVudDo6aXNQcmVzZW50YXRpb25BdHRyaWJ1dGUgY29uc3Qp OgorICAgICAgICAqIGh0bWwvSFRNTElGcmFtZUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SFRNTElGcmFtZUVsZW1lbnQ6OmlzUHJlc2VudGF0aW9uQXR0cmlidXRlIGNvbnN0KToKKyAg ICAgICAgKiBodG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRN TEltYWdlRWxlbWVudDo6aXNQcmVzZW50YXRpb25BdHRyaWJ1dGUgY29uc3QpOgorICAgICAgICAq IGh0bWwvSFRNTElucHV0RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW5wdXRF bGVtZW50Ojppc1ByZXNlbnRhdGlvbkF0dHJpYnV0ZSBjb25zdCk6CisgICAgICAgICogaHRtbC9I VE1MUGFyYWdyYXBoRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MUGFyYWdyYXBo RWxlbWVudDo6aXNQcmVzZW50YXRpb25BdHRyaWJ1dGUgY29uc3QpOiBEZWxldGVkLgorICAgICAg ICAqIGh0bWwvSFRNTFBhcmFncmFwaEVsZW1lbnQuaDoKKyAgICAgICAgKiBodG1sL0hUTUxUYWJs ZUNhcHRpb25FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUYWJsZUNhcHRpb25F bGVtZW50Ojppc1ByZXNlbnRhdGlvbkF0dHJpYnV0ZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAg ICogaHRtbC9IVE1MVGFibGVDYXB0aW9uRWxlbWVudC5oOgorICAgICAgICAqIGh0bWwvSFRNTFRh YmxlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVGFibGVFbGVtZW50Ojppc1By ZXNlbnRhdGlvbkF0dHJpYnV0ZSBjb25zdCk6CisgICAgICAgICogaHRtbC9IVE1MVGFibGVQYXJ0 RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVGFibGVQYXJ0RWxlbWVudDo6aXNQ cmVzZW50YXRpb25BdHRyaWJ1dGUgY29uc3QpOgorCiAyMDE5LTAxLTE0ICBDb21taXQgUXVldWUg IDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5n IG91dCByMjM5OTAxLCByMjM5OTA5LCByMjM5OTEwLCByMjM5OTEyLApJbmRleDogU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MRGl2RWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MRGl2RWxlbWVudC5jcHAJKHJldmlzaW9uIDIzOTk0MykKKysrIFNvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTERpdkVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MCwxMyAr NTAsNiBAQCBSZWY8SFRNTERpdkVsZW1lbnQ+IEhUTUxEaXZFbGVtZW50OjpjcmVhCiAgICAgcmV0 dXJuIGFkb3B0UmVmKCpuZXcgSFRNTERpdkVsZW1lbnQodGFnTmFtZSwgZG9jdW1lbnQpKTsKIH0K IAotYm9vbCBIVE1MRGl2RWxlbWVudDo6aXNQcmVzZW50YXRpb25BdHRyaWJ1dGUoY29uc3QgUXVh bGlmaWVkTmFtZSYgbmFtZSkgY29uc3QKLXsKLSAgICBpZiAobmFtZSA9PSBhbGlnbkF0dHIpCi0g ICAgICAgIHJldHVybiB0cnVlOwotICAgIHJldHVybiBIVE1MRWxlbWVudDo6aXNQcmVzZW50YXRp b25BdHRyaWJ1dGUobmFtZSk7Ci19Ci0KIHZvaWQgSFRNTERpdkVsZW1lbnQ6OmNvbGxlY3RTdHls ZUZvclByZXNlbnRhdGlvbkF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lLCBjb25z dCBBdG9taWNTdHJpbmcmIHZhbHVlLCBNdXRhYmxlU3R5bGVQcm9wZXJ0aWVzJiBzdHlsZSkKIHsK ICAgICBpZiAobmFtZSA9PSBhbGlnbkF0dHIpIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTERpdkVsZW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxE aXZFbGVtZW50LmgJKHJldmlzaW9uIDIzOTk0MykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TERpdkVsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMzYsNyArMzYsNiBAQCBwcm90ZWN0ZWQ6 CiAgICAgSFRNTERpdkVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYsIERvY3VtZW50Jik7CiAK IHByaXZhdGU6Ci0gICAgYm9vbCBpc1ByZXNlbnRhdGlvbkF0dHJpYnV0ZShjb25zdCBRdWFsaWZp ZWROYW1lJikgY29uc3QgZmluYWw7CiAgICAgdm9pZCBjb2xsZWN0U3R5bGVGb3JQcmVzZW50YXRp b25BdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYsIGNvbnN0IEF0b21pY1N0cmluZyYsIE11 dGFibGVTdHlsZVByb3BlcnRpZXMmKSBmaW5hbDsKIH07CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTEVtYmVkRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MRW1iZWRFbGVtZW50LmNwcAkocmV2aXNpb24gMjM5OTQzKQorKysgU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MRW1iZWRFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTAsMTMg KzkwLDYgQEAgUmVuZGVyV2lkZ2V0KiBIVE1MRW1iZWRFbGVtZW50OjpyZW5kZXJXaQogICAgIHJl dHVybiBmaW5kV2lkZ2V0UmVuZGVyZXIodGhpcyk7CiB9CiAKLWJvb2wgSFRNTEVtYmVkRWxlbWVu dDo6aXNQcmVzZW50YXRpb25BdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSkgY29u c3QKLXsKLSAgICBpZiAobmFtZSA9PSBoaWRkZW5BdHRyKQotICAgICAgICByZXR1cm4gdHJ1ZTsK LSAgICByZXR1cm4gSFRNTFBsdWdJbkltYWdlRWxlbWVudDo6aXNQcmVzZW50YXRpb25BdHRyaWJ1 dGUobmFtZSk7Ci19Ci0KIHZvaWQgSFRNTEVtYmVkRWxlbWVudDo6Y29sbGVjdFN0eWxlRm9yUHJl c2VudGF0aW9uQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUsIGNvbnN0IEF0b21p Y1N0cmluZyYgdmFsdWUsIE11dGFibGVTdHlsZVByb3BlcnRpZXMmIHN0eWxlKQogewogICAgIGlm IChuYW1lID09IGhpZGRlbkF0dHIpIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVt YmVkRWxlbWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVtYmVk RWxlbWVudC5oCShyZXZpc2lvbiAyMzk5NDMpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxF bWJlZEVsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMzYsNyArMzYsNiBAQCBwcml2YXRlOgog ICAgIEhUTUxFbWJlZEVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYsIERvY3VtZW50Jik7CiAK ICAgICB2b2lkIHBhcnNlQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmLCBjb25zdCBBdG9t aWNTdHJpbmcmKSBmaW5hbDsKLSAgICBib29sIGlzUHJlc2VudGF0aW9uQXR0cmlidXRlKGNvbnN0 IFF1YWxpZmllZE5hbWUmKSBjb25zdCBmaW5hbDsKICAgICB2b2lkIGNvbGxlY3RTdHlsZUZvclBy ZXNlbnRhdGlvbkF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiwgY29uc3QgQXRvbWljU3Ry aW5nJiwgTXV0YWJsZVN0eWxlUHJvcGVydGllcyYpIGZpbmFsOwogCiAgICAgYm9vbCByZW5kZXJl cklzTmVlZGVkKGNvbnN0IFJlbmRlclN0eWxlJikgZmluYWw7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxIUkVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTEhSRWxlbWVudC5jcHAJKHJldmlzaW9uIDIzOTk0MykKKysrIFNvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTEhSRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU0LDcgKzU0LDcgQEAg UmVmPEhUTUxIUkVsZW1lbnQ+IEhUTUxIUkVsZW1lbnQ6OmNyZWF0ZQogCiBib29sIEhUTUxIUkVs ZW1lbnQ6OmlzUHJlc2VudGF0aW9uQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUp IGNvbnN0CiB7Ci0gICAgaWYgKG5hbWUgPT0gYWxpZ25BdHRyIHx8IG5hbWUgPT0gd2lkdGhBdHRy IHx8IG5hbWUgPT0gY29sb3JBdHRyIHx8IG5hbWUgPT0gbm9zaGFkZUF0dHIgfHwgbmFtZSA9PSBz aXplQXR0cikKKyAgICBpZiAobmFtZSA9PSB3aWR0aEF0dHIgfHwgbmFtZSA9PSBjb2xvckF0dHIg fHwgbmFtZSA9PSBub3NoYWRlQXR0ciB8fCBuYW1lID09IHNpemVBdHRyKQogICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICByZXR1cm4gSFRNTEVsZW1lbnQ6OmlzUHJlc2VudGF0aW9uQXR0cmlidXRl KG5hbWUpOwogfQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSUZyYW1lRWxlbWVudC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSUZyYW1lRWxlbWVudC5j cHAJKHJldmlzaW9uIDIzOTk0MykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElGcmFtZUVs ZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Miw3ICs2Miw3IEBAIERPTVRva2VuTGlzdCYg SFRNTElGcmFtZUVsZW1lbnQ6OnNhbmRib3gKIAogYm9vbCBIVE1MSUZyYW1lRWxlbWVudDo6aXNQ cmVzZW50YXRpb25BdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSkgY29uc3QKIHsK LSAgICBpZiAobmFtZSA9PSB3aWR0aEF0dHIgfHwgbmFtZSA9PSBoZWlnaHRBdHRyIHx8IG5hbWUg PT0gYWxpZ25BdHRyIHx8IG5hbWUgPT0gZnJhbWVib3JkZXJBdHRyKQorICAgIGlmIChuYW1lID09 IHdpZHRoQXR0ciB8fCBuYW1lID09IGhlaWdodEF0dHIgfHwgbmFtZSA9PSBmcmFtZWJvcmRlckF0 dHIpCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIHJldHVybiBIVE1MRnJhbWVFbGVtZW50QmFz ZTo6aXNQcmVzZW50YXRpb25BdHRyaWJ1dGUobmFtZSk7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAJKHJldmlzaW9uIDIzOTk0MykKKysrIFNvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNCw3 ICsxMTQsNyBAQCBSZWY8SFRNTEltYWdlRWxlbWVudD4gSFRNTEltYWdlRWxlbWVudDo6CiAKIGJv b2wgSFRNTEltYWdlRWxlbWVudDo6aXNQcmVzZW50YXRpb25BdHRyaWJ1dGUoY29uc3QgUXVhbGlm aWVkTmFtZSYgbmFtZSkgY29uc3QKIHsKLSAgICBpZiAobmFtZSA9PSB3aWR0aEF0dHIgfHwgbmFt ZSA9PSBoZWlnaHRBdHRyIHx8IG5hbWUgPT0gYm9yZGVyQXR0ciB8fCBuYW1lID09IHZzcGFjZUF0 dHIgfHwgbmFtZSA9PSBoc3BhY2VBdHRyIHx8IG5hbWUgPT0gYWxpZ25BdHRyIHx8IG5hbWUgPT0g dmFsaWduQXR0cikKKyAgICBpZiAobmFtZSA9PSB3aWR0aEF0dHIgfHwgbmFtZSA9PSBoZWlnaHRB dHRyIHx8IG5hbWUgPT0gYm9yZGVyQXR0ciB8fCBuYW1lID09IHZzcGFjZUF0dHIgfHwgbmFtZSA9 PSBoc3BhY2VBdHRyIHx8IG5hbWUgPT0gdmFsaWduQXR0cikKICAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgcmV0dXJuIEhUTUxFbGVtZW50Ojppc1ByZXNlbnRhdGlvbkF0dHJpYnV0ZShuYW1lKTsK IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcAkocmV2aXNp b24gMjM5OTQzKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcAko d29ya2luZyBjb3B5KQpAQCAtNjQ1LDcgKzY0NSw3IEBAIHZvaWQgSFRNTElucHV0RWxlbWVudDo6 YWNjZXNzS2V5QWN0aW9uKGIKIAogYm9vbCBIVE1MSW5wdXRFbGVtZW50Ojppc1ByZXNlbnRhdGlv bkF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lKSBjb25zdAogewotICAgIGlmIChu YW1lID09IHZzcGFjZUF0dHIgfHwgbmFtZSA9PSBoc3BhY2VBdHRyIHx8IG5hbWUgPT0gYWxpZ25B dHRyIHx8IG5hbWUgPT0gd2lkdGhBdHRyIHx8IG5hbWUgPT0gaGVpZ2h0QXR0ciB8fCAobmFtZSA9 PSBib3JkZXJBdHRyICYmIGlzSW1hZ2VCdXR0b24oKSkpCisgICAgaWYgKG5hbWUgPT0gdnNwYWNl QXR0ciB8fCBuYW1lID09IGhzcGFjZUF0dHIgfHwgbmFtZSA9PSB3aWR0aEF0dHIgfHwgbmFtZSA9 PSBoZWlnaHRBdHRyIHx8IChuYW1lID09IGJvcmRlckF0dHIgJiYgaXNJbWFnZUJ1dHRvbigpKSkK ICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgcmV0dXJuIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVt ZW50Ojppc1ByZXNlbnRhdGlvbkF0dHJpYnV0ZShuYW1lKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTFBhcmFncmFwaEVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTFBhcmFncmFwaEVsZW1lbnQuY3BwCShyZXZpc2lvbiAyMzk5NDMpCisr KyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQYXJhZ3JhcGhFbGVtZW50LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNTEsMTMgKzUxLDYgQEAgUmVmPEhUTUxQYXJhZ3JhcGhFbGVtZW50PiBIVE1MUGFy YWdyYXBoRQogICAgIHJldHVybiBhZG9wdFJlZigqbmV3IEhUTUxQYXJhZ3JhcGhFbGVtZW50KHRh Z05hbWUsIGRvY3VtZW50KSk7CiB9CiAKLWJvb2wgSFRNTFBhcmFncmFwaEVsZW1lbnQ6OmlzUHJl c2VudGF0aW9uQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUpIGNvbnN0Ci17Ci0g ICAgaWYgKG5hbWUgPT0gYWxpZ25BdHRyKQotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICByZXR1 cm4gSFRNTEVsZW1lbnQ6OmlzUHJlc2VudGF0aW9uQXR0cmlidXRlKG5hbWUpOwotfQotCiB2b2lk IEhUTUxQYXJhZ3JhcGhFbGVtZW50Ojpjb2xsZWN0U3R5bGVGb3JQcmVzZW50YXRpb25BdHRyaWJ1 dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSwgY29uc3QgQXRvbWljU3RyaW5nJiB2YWx1ZSwg TXV0YWJsZVN0eWxlUHJvcGVydGllcyYgc3R5bGUpCiB7CiAgICAgaWYgKG5hbWUgPT0gYWxpZ25B dHRyKSB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQYXJhZ3JhcGhFbGVtZW50LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGFyYWdyYXBoRWxlbWVudC5o CShyZXZpc2lvbiAyMzk5NDMpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQYXJhZ3JhcGhF bGVtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTM1LDcgKzM1LDYgQEAgcHVibGljOgogcHJpdmF0 ZToKICAgICBIVE1MUGFyYWdyYXBoRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiwgRG9jdW1l bnQmKTsKIAotICAgIGJvb2wgaXNQcmVzZW50YXRpb25BdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVk TmFtZSYpIGNvbnN0IGZpbmFsOwogICAgIHZvaWQgY29sbGVjdFN0eWxlRm9yUHJlc2VudGF0aW9u QXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmLCBjb25zdCBBdG9taWNTdHJpbmcmLCBNdXRh YmxlU3R5bGVQcm9wZXJ0aWVzJikgZmluYWw7CiB9OwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxUYWJsZUNhcHRpb25FbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxUYWJsZUNhcHRpb25FbGVtZW50LmNwcAkocmV2aXNpb24gMjM5OTQzKQor KysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGFibGVDYXB0aW9uRWxlbWVudC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTQ2LDEzICs0Niw2IEBAIFJlZjxIVE1MVGFibGVDYXB0aW9uRWxlbWVudD4g SFRNTFRhYmxlQ2EKICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBIVE1MVGFibGVDYXB0aW9uRWxl bWVudCh0YWdOYW1lLCBkb2N1bWVudCkpOwogfQogCi1ib29sIEhUTUxUYWJsZUNhcHRpb25FbGVt ZW50Ojppc1ByZXNlbnRhdGlvbkF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lKSBj b25zdAotewotICAgIGlmIChuYW1lID09IGFsaWduQXR0cikKLSAgICAgICAgcmV0dXJuIHRydWU7 Ci0gICAgcmV0dXJuIEhUTUxFbGVtZW50Ojppc1ByZXNlbnRhdGlvbkF0dHJpYnV0ZShuYW1lKTsK LX0KLQogdm9pZCBIVE1MVGFibGVDYXB0aW9uRWxlbWVudDo6Y29sbGVjdFN0eWxlRm9yUHJlc2Vu dGF0aW9uQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUsIGNvbnN0IEF0b21pY1N0 cmluZyYgdmFsdWUsIE11dGFibGVTdHlsZVByb3BlcnRpZXMmIHN0eWxlKQogewogICAgIGlmIChu YW1lID09IGFsaWduQXR0cikgewpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGFibGVD YXB0aW9uRWxlbWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRh YmxlQ2FwdGlvbkVsZW1lbnQuaAkocmV2aXNpb24gMjM5OTQzKQorKysgU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MVGFibGVDYXB0aW9uRWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw3ICsz Nyw2IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgSFRNTFRhYmxlQ2FwdGlvbkVsZW1lbnQoY29u c3QgUXVhbGlmaWVkTmFtZSYsIERvY3VtZW50Jik7CiAKLSAgICBib29sIGlzUHJlc2VudGF0aW9u QXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmKSBjb25zdCBmaW5hbDsKICAgICB2b2lkIGNv bGxlY3RTdHlsZUZvclByZXNlbnRhdGlvbkF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiwg Y29uc3QgQXRvbWljU3RyaW5nJiwgTXV0YWJsZVN0eWxlUHJvcGVydGllcyYpIGZpbmFsOwogfTsK IApJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGFibGVFbGVtZW50LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUYWJsZUVsZW1lbnQuY3BwCShyZXZpc2lv biAyMzk5NDMpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUYWJsZUVsZW1lbnQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zNjMsNyArMzYzLDcgQEAgdm9pZCBIVE1MVGFibGVFbGVtZW50Ojpj b2xsZWN0U3R5bGVGb3JQcgogCiBib29sIEhUTUxUYWJsZUVsZW1lbnQ6OmlzUHJlc2VudGF0aW9u QXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUpIGNvbnN0CiB7Ci0gICAgaWYgKG5h bWUgPT0gd2lkdGhBdHRyIHx8IG5hbWUgPT0gaGVpZ2h0QXR0ciB8fCBuYW1lID09IGJnY29sb3JB dHRyIHx8IG5hbWUgPT0gYmFja2dyb3VuZEF0dHIgfHwgbmFtZSA9PSB2YWxpZ25BdHRyIHx8IG5h bWUgPT0gdnNwYWNlQXR0ciB8fCBuYW1lID09IGhzcGFjZUF0dHIgfHwgbmFtZSA9PSBhbGlnbkF0 dHIgfHwgbmFtZSA9PSBjZWxsc3BhY2luZ0F0dHIgfHwgbmFtZSA9PSBib3JkZXJBdHRyIHx8IG5h bWUgPT0gYm9yZGVyY29sb3JBdHRyIHx8IG5hbWUgPT0gZnJhbWVBdHRyIHx8IG5hbWUgPT0gcnVs ZXNBdHRyKQorICAgIGlmIChuYW1lID09IHdpZHRoQXR0ciB8fCBuYW1lID09IGhlaWdodEF0dHIg fHwgbmFtZSA9PSBiZ2NvbG9yQXR0ciB8fCBuYW1lID09IGJhY2tncm91bmRBdHRyIHx8IG5hbWUg PT0gdmFsaWduQXR0ciB8fCBuYW1lID09IHZzcGFjZUF0dHIgfHwgbmFtZSA9PSBoc3BhY2VBdHRy IHx8IG5hbWUgPT0gY2VsbHNwYWNpbmdBdHRyIHx8IG5hbWUgPT0gYm9yZGVyQXR0ciB8fCBuYW1l ID09IGJvcmRlcmNvbG9yQXR0ciB8fCBuYW1lID09IGZyYW1lQXR0ciB8fCBuYW1lID09IHJ1bGVz QXR0cikKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgcmV0dXJuIEhUTUxFbGVtZW50Ojppc1By ZXNlbnRhdGlvbkF0dHJpYnV0ZShuYW1lKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTFRhYmxlUGFydEVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTFRhYmxlUGFydEVsZW1lbnQuY3BwCShyZXZpc2lvbiAyMzk5NDMpCisrKyBTb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxUYWJsZVBhcnRFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAt NDMsNyArNDMsNyBAQCB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwogCiBib29sIEhUTUxUYWJs ZVBhcnRFbGVtZW50Ojppc1ByZXNlbnRhdGlvbkF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1l JiBuYW1lKSBjb25zdAogewotICAgIGlmIChuYW1lID09IGJnY29sb3JBdHRyIHx8IG5hbWUgPT0g YmFja2dyb3VuZEF0dHIgfHwgbmFtZSA9PSB2YWxpZ25BdHRyIHx8IG5hbWUgPT0gYWxpZ25BdHRy IHx8IG5hbWUgPT0gaGVpZ2h0QXR0cikKKyAgICBpZiAobmFtZSA9PSBiZ2NvbG9yQXR0ciB8fCBu YW1lID09IGJhY2tncm91bmRBdHRyIHx8IG5hbWUgPT0gdmFsaWduQXR0ciB8fCBuYW1lID09IGhl aWdodEF0dHIpCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIHJldHVybiBIVE1MRWxlbWVudDo6 aXNQcmVzZW50YXRpb25BdHRyaWJ1dGUobmFtZSk7CiB9Cg==