44458 2010-08-23 15:01:53 -0700 ApplyStyleCommand::applyInlineStyle needs cleanup 2010-08-30 10:12:22 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 43989 1 rniwa rniwa darin mitz ojan tkent tony oldest_to_newest 268117 0 rniwa 2010-08-23 15:01:53 -0700 Since the bug 43989 has been resolved, we can cleanup ApplyStyleCommand::applyInlineStyle now. A patch coming. 268125 1 65166 rniwa 2010-08-23 15:25:46 -0700 Created attachment 65166 cleanup 271484 2 rniwa 2010-08-30 10:12:22 -0700 Committed r66394: <http://trac.webkit.org/changeset/66394> 65166 2010-08-23 15:25:46 -0700 2010-08-29 12:59:51 -0700 cleanup bug-44458-20100823152545.patch text/plain 9740 rniwa SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTgzNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDgtMjMgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXBw bHlTdHlsZUNvbW1hbmQ6OmFwcGx5SW5saW5lU3R5bGUgbmVlZHMgY2xlYW51cAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ0NTgKKworICAgICAgICBD bGVhbnVwOgorICAgICAgICAxLiBJc29sYXRlZCBjb2RlIHRvIGZpbmQgdGhlIGhpZ2hlc3QgYW5j ZXN0b3Igd2l0aCBlbWJlZGRpbmcgc3R5bGUsIGFuZCBkZXBsb3llZCBpdCBpbgorICAgICAgICAg ICBBcHBseVN0eWxlQ29tbWFuZDo6YXBwbHlJbmxpbmVTdHlsZS4KKyAgICAgICAgMi4gQ29tYmlu ZWQgdGhlIGNvZGUgdG8gcmVtb3ZlIGVtYmVkZGluZyBzdHlsZSB1cCB0byBlbmNsb3NpbmcgYmxv Y2sgYW5kIHRoZSBjb2RlIHRvCisgICAgICAgICAgIHJlbW92ZSB1bmljb2RlLWJpZGkgYW5kIGRp cmVjdGlvbiBwcm9wZXJ0aWVzIGJldHdlZW4gc3RhcnQgYW5kIGVuZCBub2Rlcy4KKyAgICAgICAg My4gU2ltcGxpZmllZCB0aGUgY29uZGl0aW9uYWxzIHRvIGFwcGx5IGVtYmVkZGluZyBzdHlsZXMu CisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFyZSBhZGRlZCBzaW5jZSB0aGlzIGlzIGEgY2xlYW51 cC4KKworICAgICAgICAqIGVkaXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6aGlnaGVzdEVtYmVkZGluZ0FuY2VzdG9yKTogQWRkZWQuCisgICAgICAgIChXZWJD b3JlOjpBcHBseVN0eWxlQ29tbWFuZDo6YXBwbHlJbmxpbmVTdHlsZSk6IFNlZSBhYm92ZS4KKwog MjAxMC0wOC0yMyAgSWFpbiBNZXJyaWNrICA8aHVza3lAZ29vZ2xlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBTdGV2ZSBCbG9jay4KSW5kZXg6IFdlYkNvcmUvZWRpdGluZy9BcHBseVN0eWxl Q29tbWFuZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9lZGl0aW5nL0FwcGx5U3R5bGVDb21t YW5kLmNwcAkocmV2aXNpb24gNjU4MjgpCisrKyBXZWJDb3JlL2VkaXRpbmcvQXBwbHlTdHlsZUNv bW1hbmQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04OTIsNiArODkyLDE2IEBAIHZvaWQgQXBwbHlT dHlsZUNvbW1hbmQ6OnJlbW92ZUVtYmVkZGluZ1UKICAgICB9CiB9CiAKK3N0YXRpYyBOb2RlKiBo aWdoZXN0RW1iZWRkaW5nQW5jZXN0b3IoTm9kZSogc3RhcnROb2RlLCBOb2RlKiBlbmNsb3NpbmdO b2RlKQoreworICAgIGZvciAoTm9kZSogbiA9IHN0YXJ0Tm9kZTsgbiAmJiBuICE9IGVuY2xvc2lu Z05vZGU7IG4gPSBuLT5wYXJlbnQoKSkgeworICAgICAgICBpZiAobi0+aXNIVE1MRWxlbWVudCgp ICYmIGdldElkZW50aWZpZXJWYWx1ZShjb21wdXRlZFN0eWxlKG4pLmdldCgpLCBDU1NQcm9wZXJ0 eVVuaWNvZGVCaWRpKSA9PSBDU1NWYWx1ZUVtYmVkKQorICAgICAgICAgICAgcmV0dXJuIG47Cisg ICAgfQorCisgICAgcmV0dXJuIDA7Cit9CisKIHZvaWQgQXBwbHlTdHlsZUNvbW1hbmQ6OmFwcGx5 SW5saW5lU3R5bGUoQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24gKnN0eWxlKQogewogICAgIE5v ZGUqIHN0YXJ0RHVtbXlTcGFuQW5jZXN0b3IgPSAwOwpAQCAtOTM1LDU2ICs5NDUsNTEgQEAgdm9p ZCBBcHBseVN0eWxlQ29tbWFuZDo6YXBwbHlJbmxpbmVTdHlsZQogICAgICAgICBlbmREdW1teVNw YW5BbmNlc3RvciA9IGR1bW15U3BhbkFuY2VzdG9yRm9yTm9kZShlbmQubm9kZSgpKTsKICAgICB9 CiAKKyAgICAvLyBSZW1vdmUgc3R5bGUgZnJvbSB0aGUgc2VsZWN0aW9uLgorICAgIC8vIFVzZSB0 aGUgdXBzdHJlYW0gcG9zaXRpb24gb2YgdGhlIHN0YXJ0IGZvciByZW1vdmluZyBzdHlsZS4KKyAg ICAvLyBUaGlzIHdpbGwgZW5zdXJlIHdlIHJlbW92ZSBhbGwgdHJhY2VzIG9mIHRoZSByZWxldmFu dCBzdHlsZXMgZnJvbSB0aGUgc2VsZWN0aW9uCisgICAgLy8gYW5kIHByZXZlbnQgdXMgZnJvbSBh ZGRpbmcgcmVkdW5kYW50IG9uZXMsIGFzIGRlc2NyaWJlZCBpbjoKKyAgICAvLyA8cmRhcjovL3By b2JsZW0vMzcyNDM0ND4gQm9sZGluZyBhbmQgdW5ib2xkaW5nIGNyZWF0ZXMgZXh0cmFuZW91cyB0 YWdzCisgICAgUG9zaXRpb24gcmVtb3ZlU3RhcnQgPSBzdGFydC51cHN0cmVhbSgpOwogICAgIGlu dCB1bmljb2RlQmlkaSA9IGdldElkZW50aWZpZXJWYWx1ZShzdHlsZSwgQ1NTUHJvcGVydHlVbmlj b2RlQmlkaSk7CiAgICAgaW50IGRpcmVjdGlvbiA9IDA7Ci0gICAgSFRNTEVsZW1lbnQqIHN0YXJ0 VW5zcGxpdEFuY2VzdG9yID0gMDsKLSAgICBIVE1MRWxlbWVudCogZW5kVW5zcGxpdEFuY2VzdG9y ID0gMDsKKyAgICBSZWZQdHI8Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24+IHN0eWxlV2l0aG91 dEVtYmVkZGluZzsKICAgICBpZiAodW5pY29kZUJpZGkpIHsKICAgICAgICAgLy8gTGVhdmUgYWxv bmUgYW4gYW5jZXN0b3IgdGhhdCBwcm92aWRlcyB0aGUgZGVzaXJlZCBzaW5nbGUgbGV2ZWwgZW1i ZWRkaW5nLCBpZiB0aGVyZSBpcyBvbmUuCiAgICAgICAgIGlmICh1bmljb2RlQmlkaSA9PSBDU1NW YWx1ZUVtYmVkKQogICAgICAgICAgICAgZGlyZWN0aW9uID0gZ2V0SWRlbnRpZmllclZhbHVlKHN0 eWxlLCBDU1NQcm9wZXJ0eURpcmVjdGlvbik7Ci0gICAgICAgIHN0YXJ0VW5zcGxpdEFuY2VzdG9y ID0gc3BsaXRBbmNlc3RvcnNXaXRoVW5pY29kZUJpZGkoc3RhcnQubm9kZSgpLCB0cnVlLCBkaXJl Y3Rpb24pOwotICAgICAgICBlbmRVbnNwbGl0QW5jZXN0b3IgPSBzcGxpdEFuY2VzdG9yc1dpdGhV bmljb2RlQmlkaShlbmQubm9kZSgpLCBmYWxzZSwgZGlyZWN0aW9uKTsKKyAgICAgICAgSFRNTEVs ZW1lbnQqIHN0YXJ0VW5zcGxpdEFuY2VzdG9yID0gc3BsaXRBbmNlc3RvcnNXaXRoVW5pY29kZUJp ZGkoc3RhcnQubm9kZSgpLCB0cnVlLCBkaXJlY3Rpb24pOworICAgICAgICBIVE1MRWxlbWVudCog ZW5kVW5zcGxpdEFuY2VzdG9yID0gc3BsaXRBbmNlc3RvcnNXaXRoVW5pY29kZUJpZGkoZW5kLm5v ZGUoKSwgZmFsc2UsIGRpcmVjdGlvbik7CiAgICAgICAgIHJlbW92ZUVtYmVkZGluZ1VwVG9FbmNs b3NpbmdCbG9jayhzdGFydC5ub2RlKCksIHN0YXJ0VW5zcGxpdEFuY2VzdG9yKTsKICAgICAgICAg cmVtb3ZlRW1iZWRkaW5nVXBUb0VuY2xvc2luZ0Jsb2NrKGVuZC5ub2RlKCksIGVuZFVuc3BsaXRB bmNlc3Rvcik7Ci0gICAgfQogCi0gICAgLy8gUmVtb3ZlIHN0eWxlIGZyb20gdGhlIHNlbGVjdGlv bi4KLSAgICAvLyBVc2UgdGhlIHVwc3RyZWFtIHBvc2l0aW9uIG9mIHRoZSBzdGFydCBmb3IgcmVt b3Zpbmcgc3R5bGUuCi0gICAgLy8gVGhpcyB3aWxsIGVuc3VyZSB3ZSByZW1vdmUgYWxsIHRyYWNl cyBvZiB0aGUgcmVsZXZhbnQgc3R5bGVzIGZyb20gdGhlIHNlbGVjdGlvbgotICAgIC8vIGFuZCBw cmV2ZW50IHVzIGZyb20gYWRkaW5nIHJlZHVuZGFudCBvbmVzLCBhcyBkZXNjcmliZWQgaW46Ci0g ICAgLy8gPHJkYXI6Ly9wcm9ibGVtLzM3MjQzNDQ+IEJvbGRpbmcgYW5kIHVuYm9sZGluZyBjcmVh dGVzIGV4dHJhbmVvdXMgdGFncwotICAgIFBvc2l0aW9uIHJlbW92ZVN0YXJ0ID0gc3RhcnQudXBz dHJlYW0oKTsKLSAgICBQb3NpdGlvbiBlbWJlZGRpbmdSZW1vdmVTdGFydCA9IHJlbW92ZVN0YXJ0 OwotICAgIFBvc2l0aW9uIGVtYmVkZGluZ1JlbW92ZUVuZCA9IGVuZDsKLSAgICBpZiAodW5pY29k ZUJpZGkpIHsKICAgICAgICAgLy8gQXZvaWQgcmVtb3ZpbmcgdGhlIGRpciBhdHRyaWJ1dGUgYW5k IHRoZSB1bmljb2RlLWJpZGkgYW5kIGRpcmVjdGlvbiBwcm9wZXJ0aWVzIGZyb20gdGhlIHVuc3Bs aXQgYW5jZXN0b3JzLgorICAgICAgICBQb3NpdGlvbiBlbWJlZGRpbmdSZW1vdmVTdGFydCA9IHJl bW92ZVN0YXJ0OwogICAgICAgICBpZiAoc3RhcnRVbnNwbGl0QW5jZXN0b3IgJiYgbm9kZUZ1bGx5 U2VsZWN0ZWQoc3RhcnRVbnNwbGl0QW5jZXN0b3IsIHJlbW92ZVN0YXJ0LCBlbmQpKQogICAgICAg ICAgICAgZW1iZWRkaW5nUmVtb3ZlU3RhcnQgPSBwb3NpdGlvbkluUGFyZW50QWZ0ZXJOb2RlKHN0 YXJ0VW5zcGxpdEFuY2VzdG9yKTsKKworICAgICAgICBQb3NpdGlvbiBlbWJlZGRpbmdSZW1vdmVF bmQgPSBlbmQ7CiAgICAgICAgIGlmIChlbmRVbnNwbGl0QW5jZXN0b3IgJiYgbm9kZUZ1bGx5U2Vs ZWN0ZWQoZW5kVW5zcGxpdEFuY2VzdG9yLCByZW1vdmVTdGFydCwgZW5kKSkKICAgICAgICAgICAg IGVtYmVkZGluZ1JlbW92ZUVuZCA9IHBvc2l0aW9uSW5QYXJlbnRCZWZvcmVOb2RlKGVuZFVuc3Bs aXRBbmNlc3RvcikuZG93bnN0cmVhbSgpOwotICAgIH0KIAotICAgIGlmIChlbWJlZGRpbmdSZW1v dmVTdGFydCAhPSByZW1vdmVTdGFydCB8fCBlbWJlZGRpbmdSZW1vdmVFbmQgIT0gZW5kKSB7Ci0g ICAgICAgIFJlZlB0cjxDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbj4gZW1iZWRkaW5nU3R5bGUg PSBDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbjo6Y3JlYXRlKCk7Ci0gICAgICAgIGVtYmVkZGlu Z1N0eWxlLT5zZXRQcm9wZXJ0eShDU1NQcm9wZXJ0eVVuaWNvZGVCaWRpLCBDU1NWYWx1ZUVtYmVk KTsKLSAgICAgICAgZW1iZWRkaW5nU3R5bGUtPnNldFByb3BlcnR5KENTU1Byb3BlcnR5RGlyZWN0 aW9uLCBkaXJlY3Rpb24pOwotICAgICAgICBpZiAoY29tcGFyZVBvc2l0aW9ucyhlbWJlZGRpbmdS ZW1vdmVTdGFydCwgZW1iZWRkaW5nUmVtb3ZlRW5kKSA8PSAwKQotICAgICAgICAgICAgcmVtb3Zl SW5saW5lU3R5bGUoZW1iZWRkaW5nU3R5bGUsIGVtYmVkZGluZ1JlbW92ZVN0YXJ0LCBlbWJlZGRp bmdSZW1vdmVFbmQpOwotCi0gICAgICAgIFJlZlB0cjxDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlv bj4gc3R5bGVXaXRob3V0RW1iZWRkaW5nID0gc3R5bGUtPmNvcHkoKTsKLSAgICAgICAgc3R5bGVX aXRob3V0RW1iZWRkaW5nLT5yZW1vdmVQcm9wZXJ0eShDU1NQcm9wZXJ0eVVuaWNvZGVCaWRpKTsK LSAgICAgICAgc3R5bGVXaXRob3V0RW1iZWRkaW5nLT5yZW1vdmVQcm9wZXJ0eShDU1NQcm9wZXJ0 eURpcmVjdGlvbik7Ci0gICAgICAgIHJlbW92ZUlubGluZVN0eWxlKHN0eWxlV2l0aG91dEVtYmVk ZGluZywgcmVtb3ZlU3RhcnQsIGVuZCk7Ci0gICAgfSBlbHNlCi0gICAgICAgIHJlbW92ZUlubGlu ZVN0eWxlKHN0eWxlLCByZW1vdmVTdGFydCwgZW5kKTsKKyAgICAgICAgaWYgKGVtYmVkZGluZ1Jl bW92ZUVuZCAhPSByZW1vdmVTdGFydCB8fCBlbWJlZGRpbmdSZW1vdmVFbmQgIT0gZW5kKSB7Cisg ICAgICAgICAgICBSZWZQdHI8Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24+IGVtYmVkZGluZ1N0 eWxlID0gQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb246OmNyZWF0ZSgpOworICAgICAgICAgICAg ZW1iZWRkaW5nU3R5bGUtPnNldFByb3BlcnR5KENTU1Byb3BlcnR5VW5pY29kZUJpZGksIENTU1Zh bHVlRW1iZWQpOworICAgICAgICAgICAgZW1iZWRkaW5nU3R5bGUtPnNldFByb3BlcnR5KENTU1By b3BlcnR5RGlyZWN0aW9uLCBkaXJlY3Rpb24pOworICAgICAgICAgICAgaWYgKGNvbXBhcmVQb3Np dGlvbnMoZW1iZWRkaW5nUmVtb3ZlU3RhcnQsIGVtYmVkZGluZ1JlbW92ZUVuZCkgPD0gMCkKKyAg ICAgICAgICAgICAgICByZW1vdmVJbmxpbmVTdHlsZShlbWJlZGRpbmdTdHlsZSwgZW1iZWRkaW5n UmVtb3ZlU3RhcnQsIGVtYmVkZGluZ1JlbW92ZUVuZCk7CisgICAgICAgICAgICBzdHlsZVdpdGhv dXRFbWJlZGRpbmcgPSBzdHlsZS0+Y29weSgpOworICAgICAgICAgICAgc3R5bGVXaXRob3V0RW1i ZWRkaW5nLT5yZW1vdmVQcm9wZXJ0eShDU1NQcm9wZXJ0eVVuaWNvZGVCaWRpKTsKKyAgICAgICAg ICAgIHN0eWxlV2l0aG91dEVtYmVkZGluZy0+cmVtb3ZlUHJvcGVydHkoQ1NTUHJvcGVydHlEaXJl Y3Rpb24pOworICAgICAgICB9CisgICAgfQogCisgICAgcmVtb3ZlSW5saW5lU3R5bGUoc3R5bGVX aXRob3V0RW1iZWRkaW5nID8gc3R5bGVXaXRob3V0RW1iZWRkaW5nLmdldCgpIDogc3R5bGUsIHJl bW92ZVN0YXJ0LCBlbmQpOwogICAgIHN0YXJ0ID0gc3RhcnRQb3NpdGlvbigpOwogICAgIGVuZCA9 IGVuZFBvc2l0aW9uKCk7CiAKICAgICBpZiAoc3BsaXRTdGFydCkgewotICAgICAgICBib29sIG1l cmdlZFN0YXJ0ID0gbWVyZ2VTdGFydFdpdGhQcmV2aW91c0lmSWRlbnRpY2FsKHN0YXJ0LCBlbmQp OwotICAgICAgICBpZiAobWVyZ2VkU3RhcnQpIHsKKyAgICAgICAgaWYgKG1lcmdlU3RhcnRXaXRo UHJldmlvdXNJZklkZW50aWNhbChzdGFydCwgZW5kKSkgewogICAgICAgICAgICAgc3RhcnQgPSBz dGFydFBvc2l0aW9uKCk7CiAgICAgICAgICAgICBlbmQgPSBlbmRQb3NpdGlvbigpOwogICAgICAg ICB9CkBAIC0xMDAxLDQxICsxMDA2LDMzIEBAIHZvaWQgQXBwbHlTdHlsZUNvbW1hbmQ6OmFwcGx5 SW5saW5lU3R5bGUKICAgICAvLyB0byBjaGVjayBhIGNvbXB1dGVkIHN0eWxlCiAgICAgdXBkYXRl TGF5b3V0KCk7CiAKLSAgICBQb3NpdGlvbiBlbWJlZGRpbmdBcHBseVN0YXJ0ID0gc3RhcnQ7Ci0g ICAgUG9zaXRpb24gZW1iZWRkaW5nQXBwbHlFbmQgPSBlbmQ7CisgICAgUmVmUHRyPENTU011dGFi bGVTdHlsZURlY2xhcmF0aW9uPiBzdHlsZVRvQXBwbHkgPSBzdHlsZTsKICAgICBpZiAodW5pY29k ZUJpZGkpIHsKICAgICAgICAgLy8gQXZvaWQgYXBwbHlpbmcgdGhlIHVuaWNvZGUtYmlkaSBhbmQg ZGlyZWN0aW9uIHByb3BlcnRpZXMgYmVuZWF0aCBhbmNlc3RvcnMgdGhhdCBhbHJlYWR5IGhhdmUg dGhlbS4KLSAgICAgICAgTm9kZSogc3RhcnRFbmNsb3NpbmdCbG9jayA9IGVuY2xvc2luZ0Jsb2Nr KHN0YXJ0Lm5vZGUoKSk7Ci0gICAgICAgIGZvciAoTm9kZSogbiA9IHN0YXJ0Lm5vZGUoKTsgbiAh PSBzdGFydEVuY2xvc2luZ0Jsb2NrOyBuID0gbi0+cGFyZW50KCkpIHsKLSAgICAgICAgICAgIGlm IChuLT5pc0hUTUxFbGVtZW50KCkgJiYgZ2V0SWRlbnRpZmllclZhbHVlKGNvbXB1dGVkU3R5bGUo bikuZ2V0KCksIENTU1Byb3BlcnR5VW5pY29kZUJpZGkpID09IENTU1ZhbHVlRW1iZWQpIHsKLSAg ICAgICAgICAgICAgICBlbWJlZGRpbmdBcHBseVN0YXJ0ID0gcG9zaXRpb25JblBhcmVudEFmdGVy Tm9kZShuKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAgICAgICAg fQorICAgICAgICBOb2RlKiBlbWJlZGRpbmdTdGFydE5vZGUgPSBoaWdoZXN0RW1iZWRkaW5nQW5j ZXN0b3Ioc3RhcnQubm9kZSgpLCBlbmNsb3NpbmdCbG9jayhzdGFydC5ub2RlKCkpKTsKKyAgICAg ICAgTm9kZSogZW1iZWRkaW5nRW5kTm9kZSA9IGhpZ2hlc3RFbWJlZGRpbmdBbmNlc3RvcihlbmQu bm9kZSgpLCBlbmNsb3NpbmdCbG9jayhlbmQubm9kZSgpKSk7CiAKLSAgICAgICAgTm9kZSogZW5k RW5jbG9zaW5nQmxvY2sgPSBlbmNsb3NpbmdCbG9jayhlbmQubm9kZSgpKTsKLSAgICAgICAgZm9y IChOb2RlKiBuID0gZW5kLm5vZGUoKTsgbiAhPSBlbmRFbmNsb3NpbmdCbG9jazsgbiA9IG4tPnBh cmVudCgpKSB7Ci0gICAgICAgICAgICBpZiAobi0+aXNIVE1MRWxlbWVudCgpICYmIGdldElkZW50 aWZpZXJWYWx1ZShjb21wdXRlZFN0eWxlKG4pLmdldCgpLCBDU1NQcm9wZXJ0eVVuaWNvZGVCaWRp KSA9PSBDU1NWYWx1ZUVtYmVkKSB7Ci0gICAgICAgICAgICAgICAgZW1iZWRkaW5nQXBwbHlFbmQg PSBwb3NpdGlvbkluUGFyZW50QmVmb3JlTm9kZShuKTsKLSAgICAgICAgICAgICAgICBicmVhazsK LSAgICAgICAgICAgIH0KLSAgICAgICAgfQotICAgIH0KKyAgICAgICAgaWYgKGVtYmVkZGluZ1N0 YXJ0Tm9kZSB8fCBlbWJlZGRpbmdFbmROb2RlKSB7CisgICAgICAgICAgICBQb3NpdGlvbiBlbWJl ZGRpbmdBcHBseVN0YXJ0ID0gZW1iZWRkaW5nU3RhcnROb2RlID8gcG9zaXRpb25JblBhcmVudEFm dGVyTm9kZShlbWJlZGRpbmdTdGFydE5vZGUpIDogc3RhcnQ7CisgICAgICAgICAgICBQb3NpdGlv biBlbWJlZGRpbmdBcHBseUVuZCA9IGVtYmVkZGluZ0VuZE5vZGUgPyBwb3NpdGlvbkluUGFyZW50 QmVmb3JlTm9kZShlbWJlZGRpbmdFbmROb2RlKSA6IGVuZDsKKyAgICAgICAgICAgIEFTU0VSVChl bWJlZGRpbmdBcHBseVN0YXJ0LmlzTm90TnVsbCgpICYmIGVtYmVkZGluZ0FwcGx5RW5kLmlzTm90 TnVsbCgpKTsKIAotICAgIGlmIChlbWJlZGRpbmdBcHBseVN0YXJ0ICE9IHN0YXJ0IHx8IGVtYmVk ZGluZ0FwcGx5RW5kICE9IGVuZCkgewotICAgICAgICBpZiAoZW1iZWRkaW5nQXBwbHlTdGFydC5p c05vdE51bGwoKSAmJiBlbWJlZGRpbmdBcHBseUVuZC5pc05vdE51bGwoKSkgewogICAgICAgICAg ICAgUmVmUHRyPENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uPiBlbWJlZGRpbmdTdHlsZSA9IENT U011dGFibGVTdHlsZURlY2xhcmF0aW9uOjpjcmVhdGUoKTsKICAgICAgICAgICAgIGVtYmVkZGlu Z1N0eWxlLT5zZXRQcm9wZXJ0eShDU1NQcm9wZXJ0eVVuaWNvZGVCaWRpLCBDU1NWYWx1ZUVtYmVk KTsKICAgICAgICAgICAgIGVtYmVkZGluZ1N0eWxlLT5zZXRQcm9wZXJ0eShDU1NQcm9wZXJ0eURp cmVjdGlvbiwgZGlyZWN0aW9uKTsKICAgICAgICAgICAgIGFwcGx5SW5saW5lU3R5bGVUb1Jhbmdl KGVtYmVkZGluZ1N0eWxlLmdldCgpLCBlbWJlZGRpbmdBcHBseVN0YXJ0LCBlbWJlZGRpbmdBcHBs eUVuZCk7CisKKyAgICAgICAgICAgIGlmIChzdHlsZVdpdGhvdXRFbWJlZGRpbmcpCisgICAgICAg ICAgICAgICAgc3R5bGVUb0FwcGx5ID0gc3R5bGVXaXRob3V0RW1iZWRkaW5nOworICAgICAgICAg ICAgZWxzZSB7CisgICAgICAgICAgICAgICAgc3R5bGVUb0FwcGx5ID0gc3R5bGUtPmNvcHkoKTsK KyAgICAgICAgICAgICAgICBzdHlsZVRvQXBwbHktPnJlbW92ZVByb3BlcnR5KENTU1Byb3BlcnR5 VW5pY29kZUJpZGkpOworICAgICAgICAgICAgICAgIHN0eWxlVG9BcHBseS0+cmVtb3ZlUHJvcGVy dHkoQ1NTUHJvcGVydHlEaXJlY3Rpb24pOworICAgICAgICAgICAgfQogICAgICAgICB9CisgICAg fQogCi0gICAgICAgIFJlZlB0cjxDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbj4gc3R5bGVXaXRo b3V0RW1iZWRkaW5nID0gc3R5bGUtPmNvcHkoKTsKLSAgICAgICAgc3R5bGVXaXRob3V0RW1iZWRk aW5nLT5yZW1vdmVQcm9wZXJ0eShDU1NQcm9wZXJ0eVVuaWNvZGVCaWRpKTsKLSAgICAgICAgc3R5 bGVXaXRob3V0RW1iZWRkaW5nLT5yZW1vdmVQcm9wZXJ0eShDU1NQcm9wZXJ0eURpcmVjdGlvbik7 Ci0gICAgICAgIGFwcGx5SW5saW5lU3R5bGVUb1JhbmdlKHN0eWxlV2l0aG91dEVtYmVkZGluZy5n ZXQoKSwgc3RhcnQsIGVuZCk7Ci0gICAgfSBlbHNlCi0gICAgICAgIGFwcGx5SW5saW5lU3R5bGVU b1JhbmdlKHN0eWxlLCBzdGFydCwgZW5kKTsKKyAgICBhcHBseUlubGluZVN0eWxlVG9SYW5nZShz dHlsZVRvQXBwbHkuZ2V0KCksIHN0YXJ0LCBlbmQpOwogCiAgICAgLy8gUmVtb3ZlIGR1bW15IHN0 eWxlIHNwYW5zIGNyZWF0ZWQgYnkgc3BsaXR0aW5nIHRleHQgZWxlbWVudHMuCiAgICAgY2xlYW51 cFVuc3R5bGVkQXBwbGVTdHlsZVNwYW5zKHN0YXJ0RHVtbXlTcGFuQW5jZXN0b3IpOwo=