46205 2010-09-21 11:40:14 -0700 cleanup: removeInlineStyleFromElement and extractInlineStyleToPushDown should be merged 2010-09-21 22:36:57 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All All RESOLVED FIXED P2 Blocker --- 27818 1 rniwa rniwa darin enrica ojan tkent tony oldest_to_newest 282453 0 rniwa 2010-09-21 11:40:14 -0700 Since removeImplicitlyStyledElement already supports extraction of the existing style, we should extend the support to removeInlineStyleFromElement and removeCSSStyle so that extractInlineStyleToPushDown can be merged with removeInlineStyleFromElement. 282463 1 68268 rniwa 2010-09-21 11:51:46 -0700 Created attachment 68268 Patch 282731 2 68268 tkent 2010-09-21 18:59:39 -0700 Comment on attachment 68268 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=68268&action=review > WebCore/ChangeLog:12 > + (WebCore::ApplyStyleCommand::removeInlineStyleFromElement): Added extractedStyle. nit: extractedStyle -> extractedStyle parameter or extractedStyle argument > WebCore/ChangeLog:13 > + (WebCore::ApplyStyleCommand::removeCSSStyle): Added extractedStyle. ditto. 282771 3 rniwa 2010-09-21 22:36:57 -0700 Committed r68014: <http://trac.webkit.org/changeset/68014> 68268 2010-09-21 11:51:46 -0700 2010-09-21 18:59:38 -0700 Patch bug-46205-20100921115145.patch text/plain 10348 rniwa SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Nzk3MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDktMjEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgY2xl YW51cDogcmVtb3ZlSW5saW5lU3R5bGVGcm9tRWxlbWVudCBhbmQgZXh0cmFjdElubGluZVN0eWxl VG9QdXNoRG93biBzaG91bGQgYmUgbWVyZ2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD00NjIwNQorCisgICAgICAgIENsZWFudXAgcmVxdWlyZWQgdG8g Zml4IHRoZSBidWcgMjc4MTguIEFkZGVkIHRoZSBzdHlsZSBleHRyYWN0aW9uIG1lY2hhbmlzbSB0 byByZW1vdmVJbmxpbmVTdHlsZUZyb21FbGVtZW50CisgICAgICAgIGFuZCByZW1vdmVDU1NTdHls ZSBhbmQgcmVwbGFjZWQgdGhlIGNhbGwgdG8gZXh0cmFjdElubGluZVN0eWxlVG9QdXNoRG93biBi eSBhIGNhbGwgdG8gcmVtb3ZlSW5saW5lU3R5bGVGcm9tRWxlbWVudC4KKworICAgICAgICAqIGVk aXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlTdHls ZUNvbW1hbmQ6OnJlbW92ZUlubGluZVN0eWxlRnJvbUVsZW1lbnQpOiBBZGRlZCBleHRyYWN0ZWRT dHlsZS4KKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5U3R5bGVDb21tYW5kOjpyZW1vdmVDU1NTdHls ZSk6IEFkZGVkIGV4dHJhY3RlZFN0eWxlLgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlTdHlsZUNv bW1hbmQ6OnB1c2hEb3duSW5saW5lU3R5bGVBcm91bmROb2RlKTogQ2FsbHMgcmVtb3ZlSW5saW5l U3R5bGVGcm9tRWxlbWVudCBpbnN0ZWFkIG9mCisgICAgICAgIGV4dHJhY3RJbmxpbmVTdHlsZVRv UHVzaERvd24gd2hpY2ggaGFzIGJlZW4gZGVsZXRlZC4KKyAgICAgICAgKiBlZGl0aW5nL0FwcGx5 U3R5bGVDb21tYW5kLmg6CisKIDIwMTAtMDktMjEgIEFiaGlzaGVrIEFyeWEgIDxpbmZlcm5vQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZlIEh5YXR0LgpJbmRleDogV2Vi Q29yZS9lZGl0aW5nL0FwcGx5U3R5bGVDb21tYW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L2VkaXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQuY3BwCShyZXZpc2lvbiA2Nzk2NikKKysrIFdlYkNv cmUvZWRpdGluZy9BcHBseVN0eWxlQ29tbWFuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNjEs MTkgKzExNjEsMjIgQEAgYm9vbCBBcHBseVN0eWxlQ29tbWFuZDo6cmVtb3ZlU3R5bGVGcm9tUgog ICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIEFwcGx5U3R5bGVDb21tYW5kOjpyZW1vdmVJbmxp bmVTdHlsZUZyb21FbGVtZW50KENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uKiBzdHlsZSwgSFRN TEVsZW1lbnQqIGVsZW1lbnQsIElubGluZVN0eWxlUmVtb3ZhbE1vZGUgbW9kZSkKK2Jvb2wgQXBw bHlTdHlsZUNvbW1hbmQ6OnJlbW92ZUlubGluZVN0eWxlRnJvbUVsZW1lbnQoQ1NTTXV0YWJsZVN0 eWxlRGVjbGFyYXRpb24qIHN0eWxlLCBIVE1MRWxlbWVudCogZWxlbWVudCwgSW5saW5lU3R5bGVS ZW1vdmFsTW9kZSBtb2RlLCBDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbiogZXh0cmFjdGVkU3R5 bGUpCiB7CiAgICAgQVNTRVJUKHN0eWxlKTsKICAgICBBU1NFUlQoZWxlbWVudCk7CiAKICAgICBp ZiAobV9zdHlsZWRJbmxpbmVFbGVtZW50ICYmIGVsZW1lbnQtPmhhc1RhZ05hbWUobV9zdHlsZWRJ bmxpbmVFbGVtZW50LT50YWdRTmFtZSgpKSkgewotICAgICAgICBpZiAobW9kZSAhPSBSZW1vdmVO b25lKQorICAgICAgICBpZiAobW9kZSAhPSBSZW1vdmVOb25lKSB7CisgICAgICAgICAgICBpZiAo ZXh0cmFjdGVkU3R5bGUgJiYgZWxlbWVudC0+aW5saW5lU3R5bGVEZWNsKCkpCisgICAgICAgICAg ICAgICAgZXh0cmFjdGVkU3R5bGUtPm1lcmdlKGVsZW1lbnQtPmlubGluZVN0eWxlRGVjbCgpKTsK ICAgICAgICAgICAgIHJlbW92ZU5vZGVQcmVzZXJ2aW5nQ2hpbGRyZW4oZWxlbWVudCk7CisgICAg ICAgIH0KICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCiAgICAgYm9vbCByZW1vdmVkID0g ZmFsc2U7Ci0gICAgaWYgKHJlbW92ZUltcGxpY2l0bHlTdHlsZWRFbGVtZW50KHN0eWxlLCBlbGVt ZW50LCBtb2RlKSkKKyAgICBpZiAocmVtb3ZlSW1wbGljaXRseVN0eWxlZEVsZW1lbnQoc3R5bGUs IGVsZW1lbnQsIG1vZGUsIGV4dHJhY3RlZFN0eWxlKSkKICAgICAgICAgcmVtb3ZlZCA9IHRydWU7 CiAKICAgICBpZiAoIWVsZW1lbnQtPmluRG9jdW1lbnQoKSkKQEAgLTExODEsNyArMTE4NCw3IEBA IGJvb2wgQXBwbHlTdHlsZUNvbW1hbmQ6OnJlbW92ZUlubGluZVN0eWwKIAogICAgIC8vIElmIHRo ZSBub2RlIHdhcyBjb252ZXJ0ZWQgdG8gYSBzcGFuLCB0aGUgc3BhbiBtYXkgc3RpbGwgY29udGFp biByZWxldmFudAogICAgIC8vIHN0eWxlcyB3aGljaCBtdXN0IGJlIHJlbW92ZWQgKGUuZy4gPGIg c3R5bGU9J2ZvbnQtd2VpZ2h0OiBib2xkJz4pCi0gICAgaWYgKHJlbW92ZUNTU1N0eWxlKHN0eWxl LCBlbGVtZW50LCBtb2RlKSkKKyAgICBpZiAocmVtb3ZlQ1NTU3R5bGUoc3R5bGUsIGVsZW1lbnQs IG1vZGUsIGV4dHJhY3RlZFN0eWxlKSkKICAgICAgICAgcmVtb3ZlZCA9IHRydWU7CiAKICAgICBy ZXR1cm4gcmVtb3ZlZDsKQEAgLTEzMTMsMjcgKzEzMTYsMzUgQEAgdm9pZCBBcHBseVN0eWxlQ29t bWFuZDo6cmVwbGFjZVdpdGhTcGFuTwogICAgIH0KIH0KIAotYm9vbCBBcHBseVN0eWxlQ29tbWFu ZDo6cmVtb3ZlQ1NTU3R5bGUoQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24qIHN0eWxlLCBIVE1M RWxlbWVudCogZWxlbSwgSW5saW5lU3R5bGVSZW1vdmFsTW9kZSBtb2RlKQorYm9vbCBBcHBseVN0 eWxlQ29tbWFuZDo6cmVtb3ZlQ1NTU3R5bGUoQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24qIHN0 eWxlLCBIVE1MRWxlbWVudCogZWxlbWVudCwgSW5saW5lU3R5bGVSZW1vdmFsTW9kZSBtb2RlLCBD U1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbiogZXh0cmFjdGVkU3R5bGUpCiB7CiAgICAgQVNTRVJU KHN0eWxlKTsKLSAgICBBU1NFUlQoZWxlbSk7CisgICAgQVNTRVJUKGVsZW1lbnQpOwogCi0gICAg Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24qIGRlY2wgPSBlbGVtLT5pbmxpbmVTdHlsZURlY2wo KTsKKyAgICBDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbiogZGVjbCA9IGVsZW1lbnQtPmlubGlu ZVN0eWxlRGVjbCgpOwogICAgIGlmICghZGVjbCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAg ICAgYm9vbCByZW1vdmVkID0gZmFsc2U7CiAgICAgQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb246 OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IHN0eWxlLT5lbmQoKTsKICAgICBmb3IgKENTU011dGFibGVT dHlsZURlY2xhcmF0aW9uOjpjb25zdF9pdGVyYXRvciBpdCA9IHN0eWxlLT5iZWdpbigpOyBpdCAh PSBlbmQ7ICsraXQpIHsKLSAgICAgICAgQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlEID0gc3RhdGlj X2Nhc3Q8Q1NTUHJvcGVydHlJRD4oKCppdCkuaWQoKSk7CisgICAgICAgIENTU1Byb3BlcnR5SUQg cHJvcGVydHlJRCA9IHN0YXRpY19jYXN0PENTU1Byb3BlcnR5SUQ+KGl0LT5pZCgpKTsKICAgICAg ICAgUmVmUHRyPENTU1ZhbHVlPiB2YWx1ZSA9IGRlY2wtPmdldFByb3BlcnR5Q1NTVmFsdWUocHJv cGVydHlJRCk7Ci0gICAgICAgIGlmICh2YWx1ZSAmJiAocHJvcGVydHlJRCAhPSBDU1NQcm9wZXJ0 eVdoaXRlU3BhY2UgfHwgIWlzVGFiU3Bhbk5vZGUoZWxlbSkpKSB7CisgICAgICAgIGlmICh2YWx1 ZSAmJiAocHJvcGVydHlJRCAhPSBDU1NQcm9wZXJ0eVdoaXRlU3BhY2UgfHwgIWlzVGFiU3Bhbk5v ZGUoZWxlbWVudCkpKSB7CiAgICAgICAgICAgICByZW1vdmVkID0gdHJ1ZTsKICAgICAgICAgICAg IGlmIChtb2RlID09IFJlbW92ZU5vbmUpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0g ICAgICAgICAgICByZW1vdmVDU1NQcm9wZXJ0eShlbGVtLCBwcm9wZXJ0eUlEKTsKLSAgICAgICAg ICAgIGlmIChwcm9wZXJ0eUlEID09IENTU1Byb3BlcnR5VW5pY29kZUJpZGkgJiYgIWRlY2wtPmdl dFByb3BlcnR5VmFsdWUoQ1NTUHJvcGVydHlEaXJlY3Rpb24pLmlzRW1wdHkoKSkKLSAgICAgICAg ICAgICAgICByZW1vdmVDU1NQcm9wZXJ0eShlbGVtLCBDU1NQcm9wZXJ0eURpcmVjdGlvbik7CisK KyAgICAgICAgICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOworICAgICAgICAgICAgaWYgKGV4dHJh Y3RlZFN0eWxlKQorICAgICAgICAgICAgICAgIGV4dHJhY3RlZFN0eWxlLT5zZXRQcm9wZXJ0eShw cm9wZXJ0eUlELCB2YWx1ZS0+Y3NzVGV4dCgpLCBkZWNsLT5nZXRQcm9wZXJ0eVByaW9yaXR5KHBy b3BlcnR5SUQpLCBlYyk7CisgICAgICAgICAgICByZW1vdmVDU1NQcm9wZXJ0eShlbGVtZW50LCBw cm9wZXJ0eUlEKTsKKworICAgICAgICAgICAgaWYgKHByb3BlcnR5SUQgPT0gQ1NTUHJvcGVydHlV bmljb2RlQmlkaSAmJiAhZGVjbC0+Z2V0UHJvcGVydHlWYWx1ZShDU1NQcm9wZXJ0eURpcmVjdGlv bikuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICAgICAgaWYgKGV4dHJhY3RlZFN0eWxlKQorICAg ICAgICAgICAgICAgICAgICBleHRyYWN0ZWRTdHlsZS0+c2V0UHJvcGVydHkoQ1NTUHJvcGVydHlE aXJlY3Rpb24sIGRlY2wtPmdldFByb3BlcnR5VmFsdWUoQ1NTUHJvcGVydHlEaXJlY3Rpb24pLCBk ZWNsLT5nZXRQcm9wZXJ0eVByaW9yaXR5KENTU1Byb3BlcnR5RGlyZWN0aW9uKSwgZWMpOworICAg ICAgICAgICAgICAgIHJlbW92ZUNTU1Byb3BlcnR5KGVsZW1lbnQsIENTU1Byb3BlcnR5RGlyZWN0 aW9uKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KIApAQCAtMTM0MiwxMCArMTM1 MywxMCBAQCBib29sIEFwcGx5U3R5bGVDb21tYW5kOjpyZW1vdmVDU1NTdHlsZShDCiAKICAgICAv LyBObyBuZWVkIHRvIHNlcmlhbGl6ZSA8Zm9vIHN0eWxlPSIiPiBpZiB3ZSBqdXN0IHJlbW92ZWQg dGhlIGxhc3QgY3NzIHByb3BlcnR5CiAgICAgaWYgKGRlY2wtPmlzRW1wdHkoKSkKLSAgICAgICAg cmVtb3ZlTm9kZUF0dHJpYnV0ZShlbGVtLCBzdHlsZUF0dHIpOworICAgICAgICByZW1vdmVOb2Rl QXR0cmlidXRlKGVsZW1lbnQsIHN0eWxlQXR0cik7CiAKLSAgICBpZiAoaXNTcGFuV2l0aG91dEF0 dHJpYnV0ZXNPclVuc3R5bGVTdHlsZVNwYW4oZWxlbSkpCi0gICAgICAgIHJlbW92ZU5vZGVQcmVz ZXJ2aW5nQ2hpbGRyZW4oZWxlbSk7CisgICAgaWYgKGlzU3BhbldpdGhvdXRBdHRyaWJ1dGVzT3JV bnN0eWxlU3R5bGVTcGFuKGVsZW1lbnQpKQorICAgICAgICByZW1vdmVOb2RlUHJlc2VydmluZ0No aWxkcmVuKGVsZW1lbnQpOwogCiAgICAgcmV0dXJuIHJlbW92ZWQ7CiB9CkBAIC0xMzcwLDUxICsx MzgxLDYgQEAgSFRNTEVsZW1lbnQqIEFwcGx5U3R5bGVDb21tYW5kOjpoaWdoZXN0QQogICAgIHJl dHVybiByZXN1bHQ7CiB9CiAKLVBhc3NSZWZQdHI8Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24+ IEFwcGx5U3R5bGVDb21tYW5kOjpleHRyYWN0SW5saW5lU3R5bGVUb1B1c2hEb3duKENTU011dGFi bGVTdHlsZURlY2xhcmF0aW9uKiBzdHlsZVRvQXBwbHksIE5vZGUqIG5vZGUsIGJvb2wgaXNTdHls ZWRFbGVtZW50KQotewotICAgIEFTU0VSVChub2RlKTsKLSAgICBBU1NFUlQobm9kZS0+aXNFbGVt ZW50Tm9kZSgpKTsKLSAgICAKLSAgICAvLyBub24taHRtbCBlbGVtZW50cyBub3QgaGFuZGxlZCB5 ZXQKLSAgICBpZiAoIW5vZGUtPmlzSFRNTEVsZW1lbnQoKSkKLSAgICAgICAgcmV0dXJuIDA7Ci0K LSAgICBIVE1MRWxlbWVudCogZWxlbWVudCA9IHN0YXRpY19jYXN0PEhUTUxFbGVtZW50Kj4obm9k ZSk7Ci0gICAgUmVmUHRyPENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uPiBzdHlsZSA9IGVsZW1l bnQtPmlubGluZVN0eWxlRGVjbCgpOwotICAgIGlmIChpc1N0eWxlZEVsZW1lbnQpIHsKLSAgICAg ICAgcmVtb3ZlTm9kZVByZXNlcnZpbmdDaGlsZHJlbihlbGVtZW50KTsKLSAgICAgICAgcmV0dXJu IHN0eWxlLnJlbGVhc2UoKTsKLSAgICB9Ci0KLSAgICBpZiAoIXN0eWxlKSB7Ci0gICAgICAgIHN0 eWxlID0gQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb246OmNyZWF0ZSgpOwotICAgICAgICByZW1v dmVJbXBsaWNpdGx5U3R5bGVkRWxlbWVudChzdHlsZVRvQXBwbHksIGVsZW1lbnQsIFJlbW92ZUlm TmVlZGVkLCBzdHlsZS5nZXQoKSk7Ci0gICAgICAgIHJldHVybiBzdHlsZS5yZWxlYXNlKCk7Ci0g ICAgfQotCi0gICAgVmVjdG9yPGludD4gcHJvcGVydGllczsKLSAgICBDU1NNdXRhYmxlU3R5bGVE ZWNsYXJhdGlvbjo6Y29uc3RfaXRlcmF0b3IgZW5kID0gc3R5bGVUb0FwcGx5LT5lbmQoKTsKLSAg ICBmb3IgKENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uOjpjb25zdF9pdGVyYXRvciBpdCA9IHN0 eWxlVG9BcHBseS0+YmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KQotICAgICAgICBwcm9wZXJ0aWVz LmFwcGVuZChpdC0+aWQoKSk7Ci0KLSAgICBzdHlsZSA9IHN0eWxlLT5jb3B5UHJvcGVydGllc0lu U2V0KHByb3BlcnRpZXMuZGF0YSgpLCBwcm9wZXJ0aWVzLnNpemUoKSk7Ci0gICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBwcm9wZXJ0aWVzLnNpemUoKTsgaSsrKSB7Ci0gICAgICAgIFJlZlB0cjxD U1NWYWx1ZT4gcHJvcGVydHkgPSBzdHlsZS0+Z2V0UHJvcGVydHlDU1NWYWx1ZShwcm9wZXJ0aWVz W2ldKTsKLSAgICAgICAgaWYgKHByb3BlcnR5KQotICAgICAgICAgICAgcmVtb3ZlQ1NTUHJvcGVy dHkoZWxlbWVudCwgc3RhdGljX2Nhc3Q8Q1NTUHJvcGVydHlJRD4ocHJvcGVydGllc1tpXSkpOwot ICAgIH0KLQotICAgIGlmIChlbGVtZW50LT5pbmxpbmVTdHlsZURlY2woKSAmJiBlbGVtZW50LT5p bmxpbmVTdHlsZURlY2woKS0+aXNFbXB0eSgpKQotICAgICAgICByZW1vdmVOb2RlQXR0cmlidXRl KGVsZW1lbnQsIHN0eWxlQXR0cik7Ci0KLSAgICBpZiAoaXNTcGFuV2l0aG91dEF0dHJpYnV0ZXNP clVuc3R5bGVTdHlsZVNwYW4oZWxlbWVudCkpCi0gICAgICAgIHJlbW92ZU5vZGVQcmVzZXJ2aW5n Q2hpbGRyZW4oZWxlbWVudCk7Ci0KLSAgICByZW1vdmVJbXBsaWNpdGx5U3R5bGVkRWxlbWVudChz dHlsZVRvQXBwbHksIGVsZW1lbnQsIFJlbW92ZUlmTmVlZGVkLCBzdHlsZS5nZXQoKSk7Ci0KLSAg ICByZXR1cm4gc3R5bGUucmVsZWFzZSgpOwotfQotCiB2b2lkIEFwcGx5U3R5bGVDb21tYW5kOjph cHBseUlubGluZVN0eWxlVG9QdXNoRG93bihOb2RlKiBub2RlLCBDU1NNdXRhYmxlU3R5bGVEZWNs YXJhdGlvbiogc3R5bGUpCiB7CiAgICAgQVNTRVJUKG5vZGUpOwpAQCAtMTQ5Miw3ICsxNDU4LDgg QEAgdm9pZCBBcHBseVN0eWxlQ29tbWFuZDo6cHVzaERvd25JbmxpbmVTdAogICAgICAgICBSZWZQ dHI8U3R5bGVkRWxlbWVudD4gc3R5bGVkRWxlbWVudDsKICAgICAgICAgaWYgKGN1cnJlbnQtPmlz U3R5bGVkRWxlbWVudCgpICYmIG1fc3R5bGVkSW5saW5lRWxlbWVudCAmJiBjdXJyZW50LT5oYXNU YWdOYW1lKG1fc3R5bGVkSW5saW5lRWxlbWVudC0+dGFnUU5hbWUoKSkpCiAgICAgICAgICAgICBz dHlsZWRFbGVtZW50ID0gc3RhdGljX2Nhc3Q8U3R5bGVkRWxlbWVudCo+KGN1cnJlbnQpOwotICAg ICAgICBSZWZQdHI8Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24+IHN0eWxlVG9QdXNoRG93biA9 IGV4dHJhY3RJbmxpbmVTdHlsZVRvUHVzaERvd24oc3R5bGUsIGN1cnJlbnQsIHN0eWxlZEVsZW1l bnQpOworICAgICAgICBSZWZQdHI8Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24+IHN0eWxlVG9Q dXNoRG93biA9IENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uOjpjcmVhdGUoKTsKKyAgICAgICAg cmVtb3ZlSW5saW5lU3R5bGVGcm9tRWxlbWVudChzdHlsZSwgc3RhdGljX2Nhc3Q8SFRNTEVsZW1l bnQqPihjdXJyZW50KSwgUmVtb3ZlSWZOZWVkZWQsIHN0eWxlVG9QdXNoRG93bi5nZXQoKSk7CiAK ICAgICAgICAgLy8gVGhlIGlubmVyIGxvb3Agd2lsbCBnbyB0aHJvdWdoIGNoaWxkcmVuIG9uIGVh Y2ggbGV2ZWwKICAgICAgICAgLy8gRklYTUU6IHdlIHNob3VsZCBhZ2dyZWdhdGUgaW5saW5lIGNo aWxkIGVsZW1lbnRzIHRvZ2V0aGVyIHNvIHRoYXQgd2UgZG9uJ3Qgd3JhcCBlYWNoIGNoaWxkIHNl cGFyYXRlbHkuCkluZGV4OiBXZWJDb3JlL2VkaXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQuaAkocmV2aXNpb24g Njc5NjYpCisrKyBXZWJDb3JlL2VkaXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQuaAkod29ya2luZyBj b3B5KQpAQCAtNzIsMTMgKzcyLDEyIEBAIHByaXZhdGU6CiAKICAgICAvLyBzdHlsZS1yZW1vdmFs IGhlbHBlcnMKICAgICBib29sIHJlbW92ZVN0eWxlRnJvbVJ1bkJlZm9yZUFwcGx5aW5nU3R5bGUo Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24qIHN0eWxlLCBOb2RlKiYgcnVuU3RhcnQsIE5vZGUq JiBydW5FbmQpOwotICAgIGJvb2wgcmVtb3ZlSW5saW5lU3R5bGVGcm9tRWxlbWVudChDU1NNdXRh YmxlU3R5bGVEZWNsYXJhdGlvbiosIEhUTUxFbGVtZW50KiwgSW5saW5lU3R5bGVSZW1vdmFsTW9k ZSA9IFJlbW92ZUlmTmVlZGVkKTsKKyAgICBib29sIHJlbW92ZUlubGluZVN0eWxlRnJvbUVsZW1l bnQoQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24qLCBIVE1MRWxlbWVudCosIElubGluZVN0eWxl UmVtb3ZhbE1vZGUgPSBSZW1vdmVJZk5lZWRlZCwgQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24q IGV4dHJhY3RlZFN0eWxlID0gMCk7CiAgICAgaW5saW5lIGJvb2wgc2hvdWxkUmVtb3ZlSW5saW5l U3R5bGVGcm9tRWxlbWVudChDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbiogc3R5bGUsIEhUTUxF bGVtZW50KiBlbGVtZW50KSB7cmV0dXJuIHJlbW92ZUlubGluZVN0eWxlRnJvbUVsZW1lbnQoc3R5 bGUsIGVsZW1lbnQsIFJlbW92ZU5vbmUpO30KLSAgICBib29sIHJlbW92ZUltcGxpY2l0bHlTdHls ZWRFbGVtZW50KENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uKiwgSFRNTEVsZW1lbnQqLCBJbmxp bmVTdHlsZVJlbW92YWxNb2RlLCBDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbiogZXh0cmFjdGVk U3R5bGUgPSAwKTsKKyAgICBib29sIHJlbW92ZUltcGxpY2l0bHlTdHlsZWRFbGVtZW50KENTU011 dGFibGVTdHlsZURlY2xhcmF0aW9uKiwgSFRNTEVsZW1lbnQqLCBJbmxpbmVTdHlsZVJlbW92YWxN b2RlLCBDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbiogZXh0cmFjdGVkU3R5bGUpOwogICAgIHZv aWQgcmVwbGFjZVdpdGhTcGFuT3JSZW1vdmVJZldpdGhvdXRBdHRyaWJ1dGVzKEhUTUxFbGVtZW50 KiYpOwotICAgIGJvb2wgcmVtb3ZlQ1NTU3R5bGUoQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24q LCBIVE1MRWxlbWVudCosIElubGluZVN0eWxlUmVtb3ZhbE1vZGUgPSBSZW1vdmVJZk5lZWRlZCk7 CisgICAgYm9vbCByZW1vdmVDU1NTdHlsZShDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbiosIEhU TUxFbGVtZW50KiwgSW5saW5lU3R5bGVSZW1vdmFsTW9kZSA9IFJlbW92ZUlmTmVlZGVkLCBDU1NN dXRhYmxlU3R5bGVEZWNsYXJhdGlvbiogZXh0cmFjdGVkU3R5bGUgPSAwKTsKICAgICBIVE1MRWxl bWVudCogaGlnaGVzdEFuY2VzdG9yV2l0aENvbmZsaWN0aW5nSW5saW5lU3R5bGUoQ1NTTXV0YWJs ZVN0eWxlRGVjbGFyYXRpb24qLCBOb2RlKik7Ci0gICAgUGFzc1JlZlB0cjxDU1NNdXRhYmxlU3R5 bGVEZWNsYXJhdGlvbj4gZXh0cmFjdElubGluZVN0eWxlVG9QdXNoRG93bihDU1NNdXRhYmxlU3R5 bGVEZWNsYXJhdGlvbiosIE5vZGUqLCBib29sIGlzU3R5bGVkRWxlbWVudCk7CiAgICAgdm9pZCBh cHBseUlubGluZVN0eWxlVG9QdXNoRG93bihOb2RlKiwgQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRp b24gKnN0eWxlKTsKICAgICB2b2lkIHB1c2hEb3duSW5saW5lU3R5bGVBcm91bmROb2RlKENTU011 dGFibGVTdHlsZURlY2xhcmF0aW9uKiwgTm9kZSopOwogICAgIHZvaWQgcmVtb3ZlSW5saW5lU3R5 bGUoUGFzc1JlZlB0cjxDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbj4sIGNvbnN0IFBvc2l0aW9u JiBzdGFydCwgY29uc3QgUG9zaXRpb24mIGVuZCk7Cg==