45008 2010-08-31 16:58:51 -0700 applyInlineStyleToRange needs cleanup 2010-09-08 12:24:28 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All All RESOLVED FIXED P2 Blocker --- 28968 1 rniwa rniwa darin enrica justin.garcia mjs tkent tony oldest_to_newest 272512 0 rniwa 2010-08-31 16:58:51 -0700 applyInlineStyleToRange needs cleanup before the bug 28968 can be fixed. 272547 1 66154 rniwa 2010-08-31 18:07:39 -0700 Created attachment 66154 cleanup 275970 2 rniwa 2010-09-08 11:58:28 -0700 Thanks for the review, Tony. 275988 3 rniwa 2010-09-08 12:24:28 -0700 Committed r67000: <http://trac.webkit.org/changeset/67000> 66154 2010-08-31 18:07:39 -0700 2010-09-08 11:53:26 -0700 cleanup bug-45008-20100831180738.patch text/plain 9563 rniwa SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NjU2MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDgtMzEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgYXBw bHlJbmxpbmVTdHlsZVRvUmFuZ2UgbmVlZHMgY2xlYW51cAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUwMDgKKworICAgICAgICBSZW1vdmVkIHJhbmdl SXNFbXB0eSBhbmQgZXh0cmFjdGVkIHRoZSBlbnRpcmUgbG9vcCBpbnRvIGFwcGx5SW5saW5lU3R5 bGVUb05vZGVSYW5nZS4KKyAgICAgICAgYXBwbHlJbmxpbmVTdHlsZVRvUmFuZ2UgaXMgbm93IGEg d3JhcHBlciB0aGF0IGZpeGVzIHJhbmdlIGFuZCBwYXNzZXMgaXQgb24gdG8gYXBwbHlJbmxpbmVT dHlsZVRvTm9kZVJhbmdlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBhcmUgYWRkZWQgc2luY2Ug dGhpcyBpcyBhIGNsZWFudXAuCisKKyAgICAgICAgKiBlZGl0aW5nL0FwcGx5U3R5bGVDb21tYW5k LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5U3R5bGVDb21tYW5kOjphcHBseUlubGluZVN0 eWxlVG9SYW5nZSk6IENsZWFuZWQgdXAuCisgICAgICAgIChXZWJDb3JlOjpBcHBseVN0eWxlQ29t bWFuZDo6YXBwbHlJbmxpbmVTdHlsZVRvTm9kZVJhbmdlKTogRXh0cmFjdGVkIGZyb20gYXBwbHlJ bmxpbmVTdHlsZVRvUmFuZ2UuCisgICAgICAgICogZWRpdGluZy9BcHBseVN0eWxlQ29tbWFuZC5o OgorCiAyMDEwLTA4LTMxICBLZW5uZXRoIFJ1c3NlbGwgIDxrYnJAZ29vZ2xlLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBDaHJpcyBNYXJyaW4uCkluZGV4OiBXZWJDb3JlL2VkaXRpbmcvQXBw bHlTdHlsZUNvbW1hbmQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZWRpdGluZy9BcHBseVN0 eWxlQ29tbWFuZC5jcHAJKHJldmlzaW9uIDY2NTU1KQorKysgV2ViQ29yZS9lZGl0aW5nL0FwcGx5 U3R5bGVDb21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAzNyw3ICsxMDM3LDcgQEAgdm9p ZCBBcHBseVN0eWxlQ29tbWFuZDo6YXBwbHlJbmxpbmVTdHlsZQogICAgICAgICAgICAgUmVmUHRy PENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uPiBlbWJlZGRpbmdTdHlsZSA9IENTU011dGFibGVT dHlsZURlY2xhcmF0aW9uOjpjcmVhdGUoKTsKICAgICAgICAgICAgIGVtYmVkZGluZ1N0eWxlLT5z ZXRQcm9wZXJ0eShDU1NQcm9wZXJ0eVVuaWNvZGVCaWRpLCBDU1NWYWx1ZUVtYmVkKTsKICAgICAg ICAgICAgIGVtYmVkZGluZ1N0eWxlLT5zZXRQcm9wZXJ0eShDU1NQcm9wZXJ0eURpcmVjdGlvbiwg ZGlyZWN0aW9uKTsKLSAgICAgICAgICAgIGFwcGx5SW5saW5lU3R5bGVUb1JhbmdlKGVtYmVkZGlu Z1N0eWxlLmdldCgpLCBlbWJlZGRpbmdBcHBseVN0YXJ0LCBlbWJlZGRpbmdBcHBseUVuZCk7Cisg ICAgICAgICAgICBmaXhSYW5nZUFuZEFwcGx5SW5saW5lU3R5bGUoZW1iZWRkaW5nU3R5bGUuZ2V0 KCksIGVtYmVkZGluZ0FwcGx5U3RhcnQsIGVtYmVkZGluZ0FwcGx5RW5kKTsKIAogICAgICAgICAg ICAgaWYgKHN0eWxlV2l0aG91dEVtYmVkZGluZykKICAgICAgICAgICAgICAgICBzdHlsZVRvQXBw bHkgPSBzdHlsZVdpdGhvdXRFbWJlZGRpbmc7CkBAIC0xMDQ5LDcgKzEwNDksNyBAQCB2b2lkIEFw cGx5U3R5bGVDb21tYW5kOjphcHBseUlubGluZVN0eWxlCiAgICAgICAgIH0KICAgICB9CiAKLSAg ICBhcHBseUlubGluZVN0eWxlVG9SYW5nZShzdHlsZVRvQXBwbHkuZ2V0KCksIHN0YXJ0LCBlbmQp OworICAgIGZpeFJhbmdlQW5kQXBwbHlJbmxpbmVTdHlsZShzdHlsZVRvQXBwbHkuZ2V0KCksIHN0 YXJ0LCBlbmQpOwogCiAgICAgLy8gUmVtb3ZlIGR1bW15IHN0eWxlIHNwYW5zIGNyZWF0ZWQgYnkg c3BsaXR0aW5nIHRleHQgZWxlbWVudHMuCiAgICAgY2xlYW51cFVuc3R5bGVkQXBwbGVTdHlsZVNw YW5zKHN0YXJ0RHVtbXlTcGFuQW5jZXN0b3IpOwpAQCAtMTA1Nyw3OCArMTA1Nyw3MSBAQCB2b2lk IEFwcGx5U3R5bGVDb21tYW5kOjphcHBseUlubGluZVN0eWxlCiAgICAgICAgIGNsZWFudXBVbnN0 eWxlZEFwcGxlU3R5bGVTcGFucyhlbmREdW1teVNwYW5BbmNlc3Rvcik7CiB9CiAKLXZvaWQgQXBw bHlTdHlsZUNvbW1hbmQ6OmFwcGx5SW5saW5lU3R5bGVUb1JhbmdlKENTU011dGFibGVTdHlsZURl Y2xhcmF0aW9uKiBzdHlsZSwgY29uc3QgUG9zaXRpb24mIHN0YXJ0LCBjb25zdCBQb3NpdGlvbiYg cmFuZ2VFbmQpCit2b2lkIEFwcGx5U3R5bGVDb21tYW5kOjpmaXhSYW5nZUFuZEFwcGx5SW5saW5l U3R5bGUoQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24qIHN0eWxlLCBjb25zdCBQb3NpdGlvbiYg c3RhcnQsIGNvbnN0IFBvc2l0aW9uJiBlbmQpCiB7Ci0gICAgTm9kZSogbm9kZSA9IHN0YXJ0Lm5v ZGUoKTsKLSAgICBQb3NpdGlvbiBlbmQgPSByYW5nZUVuZDsKLQotICAgIGJvb2wgcmFuZ2VJc0Vt cHR5ID0gZmFsc2U7CisgICAgTm9kZSogc3RhcnROb2RlID0gc3RhcnQubm9kZSgpOwogCiAgICAg aWYgKHN0YXJ0LmRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0KCkgPj0gY2FyZXRNYXhPZmZzZXQoc3Rh cnQubm9kZSgpKSkgewotICAgICAgICBub2RlID0gbm9kZS0+dHJhdmVyc2VOZXh0Tm9kZSgpOwot ICAgICAgICBQb3NpdGlvbiBuZXdTdGFydCA9IFBvc2l0aW9uKG5vZGUsIDApOwotICAgICAgICBp ZiAoIW5vZGUgfHwgY29tcGFyZVBvc2l0aW9ucyhlbmQsIG5ld1N0YXJ0KSA8IDApCi0gICAgICAg ICAgICByYW5nZUlzRW1wdHkgPSB0cnVlOwotICAgIH0KLQotICAgIGlmICghcmFuZ2VJc0VtcHR5 KSB7Ci0gICAgICAgIC8vIHBhc3RFbmROb2RlIGlzIHRoZSBub2RlIGFmdGVyIHRoZSBsYXN0IGZ1 bGx5IHNlbGVjdGVkIG5vZGUuCi0gICAgICAgIE5vZGUqIHBhc3RFbmROb2RlID0gZW5kLm5vZGUo KTsKLSAgICAgICAgaWYgKGVuZC5kZXByZWNhdGVkRWRpdGluZ09mZnNldCgpID49IGNhcmV0TWF4 T2Zmc2V0KGVuZC5ub2RlKCkpKQotICAgICAgICAgICAgcGFzdEVuZE5vZGUgPSBlbmQubm9kZSgp LT50cmF2ZXJzZU5leHRTaWJsaW5nKCk7Ci0gICAgICAgIC8vIEZJWE1FOiBDYWxsZXJzIHNob3Vs ZCBwZXJmb3JtIHRoaXMgb3BlcmF0aW9uIG9uIGEgUmFuZ2UgdGhhdCBpbmNsdWRlcyB0aGUgYnIK LSAgICAgICAgLy8gaWYgdGhleSB3YW50IHN0eWxlIGFwcGxpZWQgdG8gdGhlIGVtcHR5IGxpbmUu Ci0gICAgICAgIGlmIChzdGFydCA9PSBlbmQgJiYgc3RhcnQubm9kZSgpLT5oYXNUYWdOYW1lKGJy VGFnKSkKLSAgICAgICAgICAgIHBhc3RFbmROb2RlID0gc3RhcnQubm9kZSgpLT50cmF2ZXJzZU5l eHROb2RlKCk7Ci0gICAgICAgIC8vIEFkZCB0aGUgc3R5bGUgdG8gc2VsZWN0ZWQgaW5saW5lIHJ1 bnMuCi0gICAgICAgIGZvciAoTm9kZSogbmV4dDsgbm9kZSAmJiBub2RlICE9IHBhc3RFbmROb2Rl OyBub2RlID0gbmV4dCkgewotICAgICAgICAgICAgCi0gICAgICAgICAgICBuZXh0ID0gbm9kZS0+ dHJhdmVyc2VOZXh0Tm9kZSgpOwotICAgICAgICAgICAgCi0gICAgICAgICAgICBpZiAoIW5vZGUt PnJlbmRlcmVyKCkgfHwgIW5vZGUtPmlzQ29udGVudEVkaXRhYmxlKCkpCi0gICAgICAgICAgICAg ICAgY29udGludWU7Ci0gICAgICAgICAgICAKLSAgICAgICAgICAgIGlmICghbm9kZS0+aXNDb250 ZW50UmljaGx5RWRpdGFibGUoKSAmJiBub2RlLT5pc0hUTUxFbGVtZW50KCkpIHsKLSAgICAgICAg ICAgICAgICAvLyBUaGlzIGlzIGEgcGxhaW50ZXh0LW9ubHkgcmVnaW9uLiBPbmx5IHByb2NlZWQg aWYgaXQncyBmdWxseSBzZWxlY3RlZC4KLSAgICAgICAgICAgICAgICAvLyBwYXN0RW5kTm9kZSBp cyB0aGUgbm9kZSBhZnRlciB0aGUgbGFzdCBmdWxseSBzZWxlY3RlZCBub2RlLCBzbyBpZiBpdCdz IGluc2lkZSBub2RlIHRoZW4KLSAgICAgICAgICAgICAgICAvLyBub2RlIGlzbid0IGZ1bGx5IHNl bGVjdGVkLgotICAgICAgICAgICAgICAgIGlmIChwYXN0RW5kTm9kZSAmJiBwYXN0RW5kTm9kZS0+ aXNEZXNjZW5kYW50T2Yobm9kZSkpCi0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAg ICAgICAgICAgIC8vIEFkZCB0byB0aGlzIGVsZW1lbnQncyBpbmxpbmUgc3R5bGUgYW5kIHNraXAg b3ZlciBpdHMgY29udGVudHMuCi0gICAgICAgICAgICAgICAgSFRNTEVsZW1lbnQqIGVsZW1lbnQg PSBzdGF0aWNfY2FzdDxIVE1MRWxlbWVudCo+KG5vZGUpOwotICAgICAgICAgICAgICAgIFJlZlB0 cjxDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbj4gaW5saW5lU3R5bGUgPSBlbGVtZW50LT5nZXRJ bmxpbmVTdHlsZURlY2woKS0+Y29weSgpOwotICAgICAgICAgICAgICAgIGlubGluZVN0eWxlLT5t ZXJnZShzdHlsZSk7Ci0gICAgICAgICAgICAgICAgc2V0Tm9kZUF0dHJpYnV0ZShlbGVtZW50LCBz dHlsZUF0dHIsIGlubGluZVN0eWxlLT5jc3NUZXh0KCkpOwotICAgICAgICAgICAgICAgIG5leHQg PSBub2RlLT50cmF2ZXJzZU5leHRTaWJsaW5nKCk7Ci0gICAgICAgICAgICAgICAgY29udGludWU7 Ci0gICAgICAgICAgICB9CisgICAgICAgIHN0YXJ0Tm9kZSA9IHN0YXJ0Tm9kZS0+dHJhdmVyc2VO ZXh0Tm9kZSgpOworICAgICAgICBpZiAoIXN0YXJ0Tm9kZSB8fCBjb21wYXJlUG9zaXRpb25zKGVu ZCwgUG9zaXRpb24oc3RhcnROb2RlLCAwKSkgPCAwKQorICAgICAgICAgICAgcmV0dXJuOworICAg IH0KKworICAgIE5vZGUqIHBhc3RFbmROb2RlID0gZW5kLm5vZGUoKTsKKyAgICBpZiAoZW5kLmRl cHJlY2F0ZWRFZGl0aW5nT2Zmc2V0KCkgPj0gY2FyZXRNYXhPZmZzZXQoZW5kLm5vZGUoKSkpCisg ICAgICAgIHBhc3RFbmROb2RlID0gZW5kLm5vZGUoKS0+dHJhdmVyc2VOZXh0U2libGluZygpOwor CisgICAgLy8gRklYTUU6IENhbGxlcnMgc2hvdWxkIHBlcmZvcm0gdGhpcyBvcGVyYXRpb24gb24g YSBSYW5nZSB0aGF0IGluY2x1ZGVzIHRoZSBicgorICAgIC8vIGlmIHRoZXkgd2FudCBzdHlsZSBh cHBsaWVkIHRvIHRoZSBlbXB0eSBsaW5lLgorICAgIGlmIChzdGFydCA9PSBlbmQgJiYgc3RhcnQu bm9kZSgpLT5oYXNUYWdOYW1lKGJyVGFnKSkKKyAgICAgICAgcGFzdEVuZE5vZGUgPSBzdGFydC5u b2RlKCktPnRyYXZlcnNlTmV4dE5vZGUoKTsKKworICAgIGFwcGx5SW5saW5lU3R5bGVUb05vZGVS YW5nZShzdHlsZSwgc3RhcnROb2RlLCBwYXN0RW5kTm9kZSk7Cit9CisKK3ZvaWQgQXBwbHlTdHls ZUNvbW1hbmQ6OmFwcGx5SW5saW5lU3R5bGVUb05vZGVSYW5nZShDU1NNdXRhYmxlU3R5bGVEZWNs YXJhdGlvbiogc3R5bGUsIE5vZGUqIG5vZGUsIE5vZGUqIHBhc3RFbmROb2RlKQoreworICAgIGZv ciAoTm9kZSogbmV4dDsgbm9kZSAmJiBub2RlICE9IHBhc3RFbmROb2RlOyBub2RlID0gbmV4dCkg eworICAgICAgICBuZXh0ID0gbm9kZS0+dHJhdmVyc2VOZXh0Tm9kZSgpOwogICAgICAgICAKLSAg ICAgICAgICAgIGlmIChpc0Jsb2NrKG5vZGUpKQotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwot ICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgaWYgKG5vZGUtPmNoaWxkTm9kZUNvdW50KCkp IHsKLSAgICAgICAgICAgICAgICBpZiAoZWRpdGluZ0lnbm9yZXNDb250ZW50KG5vZGUpKSB7Ci0g ICAgICAgICAgICAgICAgICAgIG5leHQgPSBub2RlLT50cmF2ZXJzZU5leHRTaWJsaW5nKCk7Ci0g ICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAg ICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIAotICAgICAgICAg ICAgTm9kZSogcnVuU3RhcnQgPSBub2RlOwotICAgICAgICAgICAgLy8gRmluZCB0aGUgZW5kIG9m IHRoZSBydW4uCi0gICAgICAgICAgICBOb2RlKiBzaWJsaW5nID0gbm9kZS0+bmV4dFNpYmxpbmco KTsKLSAgICAgICAgICAgIFN0eWxlQ2hhbmdlIHN0YXJ0Q2hhbmdlKHN0eWxlLCBQb3NpdGlvbihu b2RlLCAwKSk7Ci0gICAgICAgICAgICB3aGlsZSAoc2libGluZyAmJiBzaWJsaW5nICE9IHBhc3RF bmROb2RlICYmICFzaWJsaW5nLT5jb250YWlucyhwYXN0RW5kTm9kZSkKLSAgICAgICAgICAgICAg ICAgICAmJiAoIWlzQmxvY2soc2libGluZykgfHwgc2libGluZy0+aGFzVGFnTmFtZShiclRhZykp Ci0gICAgICAgICAgICAgICAgICAgJiYgU3R5bGVDaGFuZ2Uoc3R5bGUsIFBvc2l0aW9uKHNpYmxp bmcsIDApKSA9PSBzdGFydENoYW5nZSkgewotICAgICAgICAgICAgICAgIG5vZGUgPSBzaWJsaW5n OwotICAgICAgICAgICAgICAgIHNpYmxpbmcgPSBub2RlLT5uZXh0U2libGluZygpOwotICAgICAg ICAgICAgfQotICAgICAgICAgICAgLy8gUmVjb21wdXRlIG5leHQsIHNpbmNlIG5vZGUgaGFzIGNo YW5nZWQuCisgICAgICAgIGlmICghbm9kZS0+cmVuZGVyZXIoKSB8fCAhbm9kZS0+aXNDb250ZW50 RWRpdGFibGUoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAKKyAgICAgICAgaWYg KCFub2RlLT5pc0NvbnRlbnRSaWNobHlFZGl0YWJsZSgpICYmIG5vZGUtPmlzSFRNTEVsZW1lbnQo KSkgeworICAgICAgICAgICAgLy8gVGhpcyBpcyBhIHBsYWludGV4dC1vbmx5IHJlZ2lvbi4gT25s eSBwcm9jZWVkIGlmIGl0J3MgZnVsbHkgc2VsZWN0ZWQuCisgICAgICAgICAgICAvLyBwYXN0RW5k Tm9kZSBpcyB0aGUgbm9kZSBhZnRlciB0aGUgbGFzdCBmdWxseSBzZWxlY3RlZCBub2RlLCBzbyBp ZiBpdCdzIGluc2lkZSBub2RlIHRoZW4KKyAgICAgICAgICAgIC8vIG5vZGUgaXNuJ3QgZnVsbHkg c2VsZWN0ZWQuCisgICAgICAgICAgICBpZiAocGFzdEVuZE5vZGUgJiYgcGFzdEVuZE5vZGUtPmlz RGVzY2VuZGFudE9mKG5vZGUpKQorICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAg Ly8gQWRkIHRvIHRoaXMgZWxlbWVudCdzIGlubGluZSBzdHlsZSBhbmQgc2tpcCBvdmVyIGl0cyBj b250ZW50cy4KKyAgICAgICAgICAgIEhUTUxFbGVtZW50KiBlbGVtZW50ID0gc3RhdGljX2Nhc3Q8 SFRNTEVsZW1lbnQqPihub2RlKTsKKyAgICAgICAgICAgIFJlZlB0cjxDU1NNdXRhYmxlU3R5bGVE ZWNsYXJhdGlvbj4gaW5saW5lU3R5bGUgPSBlbGVtZW50LT5nZXRJbmxpbmVTdHlsZURlY2woKS0+ Y29weSgpOworICAgICAgICAgICAgaW5saW5lU3R5bGUtPm1lcmdlKHN0eWxlKTsKKyAgICAgICAg ICAgIHNldE5vZGVBdHRyaWJ1dGUoZWxlbWVudCwgc3R5bGVBdHRyLCBpbmxpbmVTdHlsZS0+Y3Nz VGV4dCgpKTsKICAgICAgICAgICAgIG5leHQgPSBub2RlLT50cmF2ZXJzZU5leHRTaWJsaW5nKCk7 Ci0gICAgICAgICAgICAvLyBBcHBseSB0aGUgc3R5bGUgdG8gdGhlIHJ1bi4KLSAgICAgICAgICAg IGFkZElubGluZVN0eWxlSWZOZWVkZWQoc3R5bGUsIHJ1blN0YXJ0LCBub2RlLCBtX3JlbW92ZU9u bHkgPyBEb05vdEFkZFN0eWxlZEVsZW1lbnQgOiBBZGRTdHlsZWRFbGVtZW50KTsKKyAgICAgICAg ICAgIGNvbnRpbnVlOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICBpZiAoaXNCbG9jayhu b2RlKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAKKyAgICAgICAgaWYgKG5vZGUt PmNoaWxkTm9kZUNvdW50KCkpIHsKKyAgICAgICAgICAgIGlmIChlZGl0aW5nSWdub3Jlc0NvbnRl bnQobm9kZSkpCisgICAgICAgICAgICAgICAgbmV4dCA9IG5vZGUtPnRyYXZlcnNlTmV4dFNpYmxp bmcoKTsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisKKyAgICAgICAgTm9kZSog cnVuRW5kID0gbm9kZTsKKyAgICAgICAgTm9kZSogc2libGluZyA9IG5vZGUtPm5leHRTaWJsaW5n KCk7CisgICAgICAgIFN0eWxlQ2hhbmdlIHN0YXJ0Q2hhbmdlKHN0eWxlLCBQb3NpdGlvbihub2Rl LCAwKSk7CisgICAgICAgIHdoaWxlIChzaWJsaW5nICYmIHNpYmxpbmcgIT0gcGFzdEVuZE5vZGUg JiYgIXNpYmxpbmctPmNvbnRhaW5zKHBhc3RFbmROb2RlKQorICAgICAgICAgICAgICAgJiYgKCFp c0Jsb2NrKHNpYmxpbmcpIHx8IHNpYmxpbmctPmhhc1RhZ05hbWUoYnJUYWcpKQorICAgICAgICAg ICAgICAgJiYgU3R5bGVDaGFuZ2Uoc3R5bGUsIFBvc2l0aW9uKHNpYmxpbmcsIDApKSA9PSBzdGFy dENoYW5nZSkgeworICAgICAgICAgICAgcnVuRW5kID0gc2libGluZzsKKyAgICAgICAgICAgIHNp YmxpbmcgPSBydW5FbmQtPm5leHRTaWJsaW5nKCk7CiAgICAgICAgIH0KKyAgICAgICAgbmV4dCA9 IHJ1bkVuZC0+dHJhdmVyc2VOZXh0U2libGluZygpOworICAgICAgICBhZGRJbmxpbmVTdHlsZUlm TmVlZGVkKHN0eWxlLCBub2RlLCBydW5FbmQsIG1fcmVtb3ZlT25seSA/IERvTm90QWRkU3R5bGVk RWxlbWVudCA6IEFkZFN0eWxlZEVsZW1lbnQpOwogICAgIH0KIH0KIApJbmRleDogV2ViQ29yZS9l ZGl0aW5nL0FwcGx5U3R5bGVDb21tYW5kLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9lZGl0aW5n L0FwcGx5U3R5bGVDb21tYW5kLmgJKHJldmlzaW9uIDY2NTU1KQorKysgV2ViQ29yZS9lZGl0aW5n L0FwcGx5U3R5bGVDb21tYW5kLmgJKHdvcmtpbmcgY29weSkKQEAgLTg4LDcgKzg4LDggQEAgcHJp dmF0ZToKICAgICB2b2lkIGFwcGx5QmxvY2tTdHlsZShDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlv biopOwogICAgIHZvaWQgYXBwbHlSZWxhdGl2ZUZvbnRTdHlsZUNoYW5nZShDU1NNdXRhYmxlU3R5 bGVEZWNsYXJhdGlvbiopOwogICAgIHZvaWQgYXBwbHlJbmxpbmVTdHlsZShDU1NNdXRhYmxlU3R5 bGVEZWNsYXJhdGlvbiopOwotICAgIHZvaWQgYXBwbHlJbmxpbmVTdHlsZVRvUmFuZ2UoQ1NTTXV0 YWJsZVN0eWxlRGVjbGFyYXRpb24qLCBjb25zdCBQb3NpdGlvbiYgc3RhcnQsIGNvbnN0IFBvc2l0 aW9uJiBlbmQpOworICAgIHZvaWQgZml4UmFuZ2VBbmRBcHBseUlubGluZVN0eWxlKENTU011dGFi bGVTdHlsZURlY2xhcmF0aW9uKiwgY29uc3QgUG9zaXRpb24mIHN0YXJ0LCBjb25zdCBQb3NpdGlv biYgZW5kKTsKKyAgICB2b2lkIGFwcGx5SW5saW5lU3R5bGVUb05vZGVSYW5nZShDU1NNdXRhYmxl U3R5bGVEZWNsYXJhdGlvbiosIE5vZGUqIHN0YXJ0Tm9kZSwgTm9kZSogcGFzdEVuZE5vZGUpOwog ICAgIHZvaWQgYWRkQmxvY2tTdHlsZShjb25zdCBTdHlsZUNoYW5nZSYsIEhUTUxFbGVtZW50Kik7 CiAgICAgdm9pZCBhZGRJbmxpbmVTdHlsZUlmTmVlZGVkKENTU011dGFibGVTdHlsZURlY2xhcmF0 aW9uKiwgTm9kZSogc3RhcnQsIE5vZGUqIGVuZCwgRUFkZFN0eWxlZEVsZW1lbnQgYWRkU3R5bGVk RWxlbWVudCA9IEFkZFN0eWxlZEVsZW1lbnQpOwogICAgIHZvaWQgc3BsaXRUZXh0QXRTdGFydChj b25zdCBQb3NpdGlvbiYgc3RhcnQsIGNvbnN0IFBvc2l0aW9uJiBlbmQpOwo=