43437 2010-08-03 11:27:48 -0700 extractAndNegateTextDecorationStyle and maxRangeOffset in ApplyStyleCommand.cpp should be deleted 2010-08-03 18:23:13 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 1 rniwa rniwa darin enrica eric justin.garcia ojan tony oldest_to_newest 259578 0 rniwa 2010-08-03 11:27:48 -0700 Per the discussion on the bug 27809, we never push down text decorations added by stylesheets. Thus extractAndNegateTextDecorationStyle is completely redundant and should be removed. As FIXME suggests, maxRangeOffset is a redundant static function that must be replaced by lastOffsetForEditing. 259584 1 63359 rniwa 2010-08-03 11:34:15 -0700 Created attachment 63359 Patch 259586 2 eric 2010-08-03 11:35:30 -0700 You changelog doesn't explain what your'e doing here. Is this dead code? 259588 3 rniwa 2010-08-03 11:42:41 -0700 (In reply to comment #2) > You changelog doesn't explain what your'e doing here. Is this dead code? Yes. extractAndNegateTextDecorationStyle was not doing anything because the method was there solely to push down nodes with text-decoration CSS rule but we decided not to push them later. 259612 4 63366 rniwa 2010-08-03 12:15:28 -0700 Created attachment 63366 Also removed pushDownTextDecorationStyleAtBoundaries 259613 5 63366 eric 2010-08-03 12:16:51 -0700 Comment on attachment 63366 Also removed pushDownTextDecorationStyleAtBoundaries Yay! Thanks! 259779 6 rniwa 2010-08-03 18:19:26 -0700 Committed r64610: <http://trac.webkit.org/changeset/64610> 259784 7 rniwa 2010-08-03 18:23:13 -0700 (In reply to comment #5) > (From update of attachment 63366 [details]) > Yay! Thanks! Thanks for the responsive review. It makes my life easier to tackle 27818. 63359 2010-08-03 11:34:15 -0700 2010-08-03 12:15:24 -0700 Patch bug-43437-20100803113414.patch text/plain 6431 rniwa SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NDU3MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDgtMDMgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgZXh0 cmFjdEFuZE5lZ2F0ZVRleHREZWNvcmF0aW9uU3R5bGUgYW5kIG1heFJhbmdlT2Zmc2V0IGluIEFw cGx5U3R5bGVDb21tYW5kLmNwcCBzaG91bGQgYmUgZGVsZXRlZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDM0MzcKKworICAgICAgICBSZW1vdmVkIGV4 dHJhY3RBbmROZWdhdGVUZXh0RGVjb3JhdGlvblN0eWxlIGFuZCByZXBsYWNlZCBtYXhSYW5nZU9m ZnNldCBieSBsYXN0T2Zmc2V0Rm9yRWRpdGluZy4KKyAgICAgICAgTm8gbmV3IHRlc3RzIGFkZGVk IHNpbmNlIHRoaXMgaXMgYSBjbGVhbiB1cC4KKworICAgICAgICAqIGVkaXRpbmcvQXBwbHlTdHls ZUNvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlTdHlsZUNvbW1hbmQ6OnB1c2hE b3duVGV4dERlY29yYXRpb25TdHlsZUFyb3VuZE5vZGUpOiBObyBsb25nZXIgdGFrZXMgZm9yY2VO ZWdhdGUgYXMgYW4gYXJndW1lbnQuCisgICAgICAgIChXZWJDb3JlOjpBcHBseVN0eWxlQ29tbWFu ZDo6cHVzaERvd25UZXh0RGVjb3JhdGlvblN0eWxlQXRCb3VuZGFyaWVzKTogT25seSBjYWxscyBw dXNoRG93blRleHREZWNvcmF0aW9uU3R5bGVBcm91bmROb2RlCisgICAgICAgIG9uY2UgZm9yIGVh Y2ggc3RhcnQgYW5kIGVuZCBhbmQgbm8gbG9uZ2VyIGNhbGxzIHVwZGF0ZUxheW91dC4KKyAgICAg ICAgKFdlYkNvcmU6OkFwcGx5U3R5bGVDb21tYW5kOjpyZW1vdmVJbmxpbmVTdHlsZSk6CisgICAg ICAgICogZWRpdGluZy9BcHBseVN0eWxlQ29tbWFuZC5oOgorCiAyMDEwLTA4LTAzICBMZWFuZHJv IFBlcmVpcmEgIDxsZWFuZHJvQHByb2Z1c2lvbi5tb2JpPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpJbmRleDogV2ViQ29yZS9lZGl0aW5nL0FwcGx5 U3R5bGVDb21tYW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcvQXBwbHlTdHls ZUNvbW1hbmQuY3BwCShyZXZpc2lvbiA2NDU2MCkKKysrIFdlYkNvcmUvZWRpdGluZy9BcHBseVN0 eWxlQ29tbWFuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzODUsMzEgKzEzODUsNiBAQCBQYXNz UmVmUHRyPENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uPiBBCiAgICAgcmV0dXJuIHRleHREZWNv cmF0aW9uU3R5bGUucmVsZWFzZSgpOwogfQogCi1QYXNzUmVmUHRyPENTU011dGFibGVTdHlsZURl Y2xhcmF0aW9uPiBBcHBseVN0eWxlQ29tbWFuZDo6ZXh0cmFjdEFuZE5lZ2F0ZVRleHREZWNvcmF0 aW9uU3R5bGUoTm9kZSogbm9kZSkKLXsKLSAgICBBU1NFUlQobm9kZSk7Ci0gICAgQVNTRVJUKG5v ZGUtPmlzRWxlbWVudE5vZGUoKSk7Ci0gICAgCi0gICAgLy8gbm9uLWh0bWwgZWxlbWVudHMgbm90 IGhhbmRsZWQgeWV0Ci0gICAgaWYgKCFub2RlLT5pc0hUTUxFbGVtZW50KCkpCi0gICAgICAgIHJl dHVybiAwOwotCi0gICAgUmVmUHRyPENTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbj4gbm9kZVN0 eWxlID0gY29tcHV0ZWRTdHlsZShub2RlKTsKLSAgICBBU1NFUlQobm9kZVN0eWxlKTsKLQotICAg IGludCBwcm9wZXJ0aWVzWzFdID0geyBDU1NQcm9wZXJ0eVRleHREZWNvcmF0aW9uIH07Ci0gICAg UmVmUHRyPENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uPiB0ZXh0RGVjb3JhdGlvblN0eWxlID0g bm9kZVN0eWxlLT5jb3B5UHJvcGVydGllc0luU2V0KHByb3BlcnRpZXMsIDEpOwotCi0gICAgUmVm UHRyPENTU1ZhbHVlPiBwcm9wZXJ0eSA9IG5vZGVTdHlsZS0+Z2V0UHJvcGVydHlDU1NWYWx1ZShD U1NQcm9wZXJ0eVRleHREZWNvcmF0aW9uKTsKLSAgICBpZiAocHJvcGVydHkgJiYgIWVxdWFsSWdu b3JpbmdDYXNlKHByb3BlcnR5LT5jc3NUZXh0KCksICJub25lIikpIHsKLSAgICAgICAgUmVmUHRy PENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uPiBuZXdTdHlsZSA9IHRleHREZWNvcmF0aW9uU3R5 bGUtPmNvcHkoKTsKLSAgICAgICAgbmV3U3R5bGUtPnNldFByb3BlcnR5KENTU1Byb3BlcnR5VGV4 dERlY29yYXRpb24sICJub25lIik7Ci0gICAgICAgIGFwcGx5VGV4dERlY29yYXRpb25TdHlsZShu b2RlLCBuZXdTdHlsZS5nZXQoKSk7Ci0gICAgfQotCi0gICAgcmV0dXJuIHRleHREZWNvcmF0aW9u U3R5bGUucmVsZWFzZSgpOwotfQotCiB2b2lkIEFwcGx5U3R5bGVDb21tYW5kOjphcHBseVRleHRE ZWNvcmF0aW9uU3R5bGUoTm9kZSAqbm9kZSwgQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24gKnN0 eWxlKQogewogICAgIEFTU0VSVChub2RlKTsKQEAgLTE0NDMsNyArMTQxOCw3IEBAIHZvaWQgQXBw bHlTdHlsZUNvbW1hbmQ6OmFwcGx5VGV4dERlY29yYXQKICAgICAgICAgc3Vycm91bmROb2RlUmFu Z2VXaXRoRWxlbWVudChub2RlLCBub2RlLCBjcmVhdGVIVE1MRWxlbWVudChkb2N1bWVudCgpLCBz VGFnKSk7ICAgIAogfQogCi12b2lkIEFwcGx5U3R5bGVDb21tYW5kOjpwdXNoRG93blRleHREZWNv cmF0aW9uU3R5bGVBcm91bmROb2RlKE5vZGUqIHRhcmdldE5vZGUsIGJvb2wgZm9yY2VOZWdhdGUp Cit2b2lkIEFwcGx5U3R5bGVDb21tYW5kOjpwdXNoRG93blRleHREZWNvcmF0aW9uU3R5bGVBcm91 bmROb2RlKE5vZGUqIHRhcmdldE5vZGUpCiB7CiAgICAgQVNTRVJUKHRhcmdldE5vZGUpOwogICAg IE5vZGUqIGhpZ2hlc3RBbmNlc3RvciA9IGhpZ2hlc3RBbmNlc3RvcldpdGhUZXh0RGVjb3JhdGlv bih0YXJnZXROb2RlKTsKQEAgLTE0NTUsNyArMTQzMCw3IEBAIHZvaWQgQXBwbHlTdHlsZUNvbW1h bmQ6OnB1c2hEb3duVGV4dERlY28KICAgICB3aGlsZSAoY3VycmVudCAhPSB0YXJnZXROb2RlKSB7 CiAgICAgICAgIEFTU0VSVChjdXJyZW50KTsKICAgICAgICAgQVNTRVJUKGN1cnJlbnQtPmNvbnRh aW5zKHRhcmdldE5vZGUpKTsKLSAgICAgICAgUmVmUHRyPENTU011dGFibGVTdHlsZURlY2xhcmF0 aW9uPiBkZWNvcmF0aW9uID0gZm9yY2VOZWdhdGUgPyBleHRyYWN0QW5kTmVnYXRlVGV4dERlY29y YXRpb25TdHlsZShjdXJyZW50KSA6IGV4dHJhY3RUZXh0RGVjb3JhdGlvblN0eWxlKGN1cnJlbnQp OworICAgICAgICBSZWZQdHI8Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24+IGRlY29yYXRpb24g PSBleHRyYWN0VGV4dERlY29yYXRpb25TdHlsZShjdXJyZW50KTsKIAogICAgICAgICAvLyBUaGUg aW5uZXIgbG9vcCB3aWxsIGdvIHRocm91Z2ggY2hpbGRyZW4gb24gZWFjaCBsZXZlbAogICAgICAg ICBOb2RlKiBjaGlsZCA9IGN1cnJlbnQtPmZpcnN0Q2hpbGQoKTsKQEAgLTE0NzgsMzAgKzE0NTMs OCBAQCB2b2lkIEFwcGx5U3R5bGVDb21tYW5kOjpwdXNoRG93blRleHREZWNvCiAKIHZvaWQgQXBw bHlTdHlsZUNvbW1hbmQ6OnB1c2hEb3duVGV4dERlY29yYXRpb25TdHlsZUF0Qm91bmRhcmllcyhj b25zdCBQb3NpdGlvbiAmc3RhcnQsIGNvbnN0IFBvc2l0aW9uICZlbmQpCiB7Ci0gICAgLy8gV2Ug bmVlZCB0byB3b3JrIGluIHR3byBwYXNzZXMuIEZpcnN0IHdlIHB1c2ggZG93biBhbnkgaW5saW5l Ci0gICAgLy8gc3R5bGVzIHRoYXQgc2V0IHRleHQgZGVjb3JhdGlvbi4gVGhlbiB3ZSBsb29rIGZv ciBhbnkgcmVtYWluaW5nCi0gICAgLy8gc3R5bGVzIChjYXVzZWQgYnkgc3R5bGVzaGVldHMpIGFu ZCBleHBsaWNpdGx5IG5lZ2F0ZSB0ZXh0Ci0gICAgLy8gZGVjb3JhdGlvbiB3aGlsZSBwdXNoaW5n IGRvd24uCi0KLSAgICBwdXNoRG93blRleHREZWNvcmF0aW9uU3R5bGVBcm91bmROb2RlKHN0YXJ0 Lm5vZGUoKSwgZmFsc2UpOwotICAgIHVwZGF0ZUxheW91dCgpOwotICAgIHB1c2hEb3duVGV4dERl Y29yYXRpb25TdHlsZUFyb3VuZE5vZGUoc3RhcnQubm9kZSgpLCB0cnVlKTsKLQotICAgIHB1c2hE b3duVGV4dERlY29yYXRpb25TdHlsZUFyb3VuZE5vZGUoZW5kLm5vZGUoKSwgZmFsc2UpOwotICAg IHVwZGF0ZUxheW91dCgpOwotICAgIHB1c2hEb3duVGV4dERlY29yYXRpb25TdHlsZUFyb3VuZE5v ZGUoZW5kLm5vZGUoKSwgdHJ1ZSk7Ci19Ci0KLS8vIEZJWE1FOiBXaHkgZG9lcyB0aGlzIGV4aXN0 PyAgQ2FsbGVycyBzaG91bGQgZWl0aGVyIHVzZSBsYXN0T2Zmc2V0Rm9yRWRpdGluZyBvciBsYXN0 T2Zmc2V0SW5Ob2RlCi1zdGF0aWMgaW50IG1heFJhbmdlT2Zmc2V0KE5vZGUgKm4pCi17Ci0gICAg aWYgKG4tPm9mZnNldEluQ2hhcmFjdGVycygpKQotICAgICAgICByZXR1cm4gbi0+bWF4Q2hhcmFj dGVyT2Zmc2V0KCk7Ci0KLSAgICBpZiAobi0+aXNFbGVtZW50Tm9kZSgpKQotICAgICAgICByZXR1 cm4gbi0+Y2hpbGROb2RlQ291bnQoKTsKLQotICAgIHJldHVybiAxOworICAgIHB1c2hEb3duVGV4 dERlY29yYXRpb25TdHlsZUFyb3VuZE5vZGUoc3RhcnQubm9kZSgpKTsKKyAgICBwdXNoRG93blRl eHREZWNvcmF0aW9uU3R5bGVBcm91bmROb2RlKGVuZC5ub2RlKCkpOwogfQogCiB2b2lkIEFwcGx5 U3R5bGVDb21tYW5kOjpyZW1vdmVJbmxpbmVTdHlsZShQYXNzUmVmUHRyPENTU011dGFibGVTdHls ZURlY2xhcmF0aW9uPiBzdHlsZSwgY29uc3QgUG9zaXRpb24gJnN0YXJ0LCBjb25zdCBQb3NpdGlv biAmZW5kKQpAQCAtMTU0NSw4ICsxNDk4LDggQEAgdm9pZCBBcHBseVN0eWxlQ29tbWFuZDo6cmVt b3ZlSW5saW5lU3R5bAogICAgICAgICAgICAgICAgICAgICAvLyBTaW5jZSBlbGVtIG11c3QgaGF2 ZSBiZWVuIGZ1bGx5IHNlbGVjdGVkLCBhbmQgaXQgaXMgYXQgdGhlIGVuZAogICAgICAgICAgICAg ICAgICAgICAvLyBvZiB0aGUgc2VsZWN0aW9uLCBpdCBpcyBjbGVhciB3ZSBjYW4gc2V0IHRoZSBu ZXcgZSBvZmZzZXQgdG8KICAgICAgICAgICAgICAgICAgICAgLy8gdGhlIG1heCByYW5nZSBvZmZz ZXQgb2YgcHJldi4KLSAgICAgICAgICAgICAgICAgICAgQVNTRVJUKGUuZGVwcmVjYXRlZEVkaXRp bmdPZmZzZXQoKSA+PSBtYXhSYW5nZU9mZnNldChlLm5vZGUoKSkpOwotICAgICAgICAgICAgICAg ICAgICBlID0gUG9zaXRpb24ocHJldiwgbWF4UmFuZ2VPZmZzZXQocHJldikpOworICAgICAgICAg ICAgICAgICAgICBBU1NFUlQoZS5kZXByZWNhdGVkRWRpdGluZ09mZnNldCgpID49IGxhc3RPZmZz ZXRGb3JFZGl0aW5nKGUubm9kZSgpKSk7CisgICAgICAgICAgICAgICAgICAgIGUgPSBQb3NpdGlv bihwcmV2LCBsYXN0T2Zmc2V0Rm9yRWRpdGluZyhwcmV2KSk7CiAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgfQogICAgICAgICB9CkluZGV4OiBXZWJDb3JlL2VkaXRpbmcvQXBwbHlTdHls ZUNvbW1hbmQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcvQXBwbHlTdHlsZUNvbW1h bmQuaAkocmV2aXNpb24gNjQ1NjApCisrKyBXZWJDb3JlL2VkaXRpbmcvQXBwbHlTdHlsZUNvbW1h bmQuaAkod29ya2luZyBjb3B5KQpAQCAtODIsOSArODIsOCBAQCBwcml2YXRlOgogICAgIGJvb2wg bm9kZUZ1bGx5U2VsZWN0ZWQoTm9kZSosIGNvbnN0IFBvc2l0aW9uJiBzdGFydCwgY29uc3QgUG9z aXRpb24mIGVuZCkgY29uc3Q7CiAgICAgYm9vbCBub2RlRnVsbHlVbnNlbGVjdGVkKE5vZGUqLCBj b25zdCBQb3NpdGlvbiYgc3RhcnQsIGNvbnN0IFBvc2l0aW9uJiBlbmQpIGNvbnN0OwogICAgIFBh c3NSZWZQdHI8Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24+IGV4dHJhY3RUZXh0RGVjb3JhdGlv blN0eWxlKE5vZGUqKTsKLSAgICBQYXNzUmVmUHRyPENTU011dGFibGVTdHlsZURlY2xhcmF0aW9u PiBleHRyYWN0QW5kTmVnYXRlVGV4dERlY29yYXRpb25TdHlsZShOb2RlKik7CiAgICAgdm9pZCBh cHBseVRleHREZWNvcmF0aW9uU3R5bGUoTm9kZSosIENTU011dGFibGVTdHlsZURlY2xhcmF0aW9u ICpzdHlsZSk7Ci0gICAgdm9pZCBwdXNoRG93blRleHREZWNvcmF0aW9uU3R5bGVBcm91bmROb2Rl KE5vZGUqLCBib29sIGZvcmNlTmVnYXRlKTsKKyAgICB2b2lkIHB1c2hEb3duVGV4dERlY29yYXRp b25TdHlsZUFyb3VuZE5vZGUoTm9kZSopOwogICAgIHZvaWQgcHVzaERvd25UZXh0RGVjb3JhdGlv blN0eWxlQXRCb3VuZGFyaWVzKGNvbnN0IFBvc2l0aW9uJiBzdGFydCwgY29uc3QgUG9zaXRpb24m IGVuZCk7CiAgICAgCiAgICAgLy8gc3R5bGUtYXBwbGljYXRpb24gaGVscGVycwo= 63366 2010-08-03 12:15:28 -0700 2010-08-03 12:16:51 -0700 Also removed pushDownTextDecorationStyleAtBoundaries bug-43437-20100803121527.patch text/plain 7700 rniwa SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NDU3MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTAtMDgtMDMgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgZXh0 cmFjdEFuZE5lZ2F0ZVRleHREZWNvcmF0aW9uU3R5bGUgYW5kIG1heFJhbmdlT2Zmc2V0IGluIEFw cGx5U3R5bGVDb21tYW5kLmNwcCBzaG91bGQgYmUgZGVsZXRlZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDM0MzcKKworICAgICAgICBSZW1vdmVkIGV4 dHJhY3RBbmROZWdhdGVUZXh0RGVjb3JhdGlvblN0eWxlIGJlY2F1c2Ugd2UgbmV2ZXIgcHVzaCBk b3duIHRleHQgZGVjb3JhdGlvbnMgYWRkZWQgYnkgQ1NTIHJ1bGVzCisgICAgICAgIGFzIGRpc2N1 c3NlZCBvbiB0aGUgYnVnIDI3ODA5LiBBbHNvIHJlbW92ZWQgcHVzaERvd25UZXh0RGVjb3JhdGlv blN0eWxlQXRCb3VuZGFyaWVzIGJlY2F1c2UgaXQgb25seSBleGlzdGVkCisgICAgICAgIHRvIGVu Y2Fwc3VsYXRlIHRoZSBjb21wbGV4aXR5IG9mIGNhbGxpbmcgcHVzaERvd25UZXh0RGVjb3JhdGlv blN0eWxlQXJvdW5kTm9kZSBmaXJzdCB3aXRoIGZvcmNlTmVnYXRlID0gZmFsc2UKKyAgICAgICAg KGNhbGxpbmcgcHVzaERvd25UZXh0RGVjb3JhdGlvblN0eWxlQXJvdW5kTm9kZSkgYW5kIGFnYWlu IHdpdGggZm9yY2VOZWdhdGUgPSB0cnVlIChjYWxsaW5nIGV4dHJhY3RBbmROZWdhdGVUZXh0RGVj b3JhdGlvblN0eWxlKQorICAgICAgICBhZnRlciB1cGRhdGluZyBsYXlvdXQgYnV0IG5laXRoZXIg dGhlIGxheW91dCB1cGRhdGUgbm9yIHRoZSBzZWNvbmQgY2FsbCB0byBwdXNoRG93blRleHREZWNv cmF0aW9uU3R5bGVBcm91bmROb2RlCisgICAgICAgIGlzIG5lZWRlZCBhZnRlciB0aGUgcmVtb3Zh bCBvZiBleHRyYWN0QW5kTmVnYXRlVGV4dERlY29yYXRpb25TdHlsZS4KKworICAgICAgICBBbHNv IHJlcGxhY2VkIG1heFJhbmdlT2Zmc2V0IGJ5IGxhc3RPZmZzZXRGb3JFZGl0aW5nIGFzIEZJWE1F IChhZGRlZCBieSByNDgyMzUpIGluZGljYXRlZC4KKworICAgICAgICBObyBuZXcgdGVzdHMgYWRk ZWQgc2luY2UgdGhpcyBpcyBhIGNsZWFuIHVwLgorCisgICAgICAgICogZWRpdGluZy9BcHBseVN0 eWxlQ29tbWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVN0eWxlQ29tbWFuZDo6cHVz aERvd25UZXh0RGVjb3JhdGlvblN0eWxlQXJvdW5kTm9kZSk6IE5vIGxvbmdlciB0YWtlcyBmb3Jj ZU5lZ2F0ZSBhcyBhbiBhcmd1bWVudC4KKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5U3R5bGVDb21t YW5kOjpyZW1vdmVJbmxpbmVTdHlsZSk6IENhbGxzIHB1c2hEb3duVGV4dERlY29yYXRpb25TdHls ZUFyb3VuZE5vZGUgZGlyZWN0bHkuCisgICAgICAgICogZWRpdGluZy9BcHBseVN0eWxlQ29tbWFu ZC5oOgorCiAyMDEwLTA4LTAzICBMZWFuZHJvIFBlcmVpcmEgIDxsZWFuZHJvQHByb2Z1c2lvbi5t b2JpPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpJ bmRleDogV2ViQ29yZS9lZGl0aW5nL0FwcGx5U3R5bGVDb21tYW5kLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL2VkaXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQuY3BwCShyZXZpc2lvbiA2NDU2MCkK KysrIFdlYkNvcmUvZWRpdGluZy9BcHBseVN0eWxlQ29tbWFuZC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEzODUsMzEgKzEzODUsNiBAQCBQYXNzUmVmUHRyPENTU011dGFibGVTdHlsZURlY2xhcmF0 aW9uPiBBCiAgICAgcmV0dXJuIHRleHREZWNvcmF0aW9uU3R5bGUucmVsZWFzZSgpOwogfQogCi1Q YXNzUmVmUHRyPENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uPiBBcHBseVN0eWxlQ29tbWFuZDo6 ZXh0cmFjdEFuZE5lZ2F0ZVRleHREZWNvcmF0aW9uU3R5bGUoTm9kZSogbm9kZSkKLXsKLSAgICBB U1NFUlQobm9kZSk7Ci0gICAgQVNTRVJUKG5vZGUtPmlzRWxlbWVudE5vZGUoKSk7Ci0gICAgCi0g ICAgLy8gbm9uLWh0bWwgZWxlbWVudHMgbm90IGhhbmRsZWQgeWV0Ci0gICAgaWYgKCFub2RlLT5p c0hUTUxFbGVtZW50KCkpCi0gICAgICAgIHJldHVybiAwOwotCi0gICAgUmVmUHRyPENTU0NvbXB1 dGVkU3R5bGVEZWNsYXJhdGlvbj4gbm9kZVN0eWxlID0gY29tcHV0ZWRTdHlsZShub2RlKTsKLSAg ICBBU1NFUlQobm9kZVN0eWxlKTsKLQotICAgIGludCBwcm9wZXJ0aWVzWzFdID0geyBDU1NQcm9w ZXJ0eVRleHREZWNvcmF0aW9uIH07Ci0gICAgUmVmUHRyPENTU011dGFibGVTdHlsZURlY2xhcmF0 aW9uPiB0ZXh0RGVjb3JhdGlvblN0eWxlID0gbm9kZVN0eWxlLT5jb3B5UHJvcGVydGllc0luU2V0 KHByb3BlcnRpZXMsIDEpOwotCi0gICAgUmVmUHRyPENTU1ZhbHVlPiBwcm9wZXJ0eSA9IG5vZGVT dHlsZS0+Z2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9wZXJ0eVRleHREZWNvcmF0aW9uKTsKLSAg ICBpZiAocHJvcGVydHkgJiYgIWVxdWFsSWdub3JpbmdDYXNlKHByb3BlcnR5LT5jc3NUZXh0KCks ICJub25lIikpIHsKLSAgICAgICAgUmVmUHRyPENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uPiBu ZXdTdHlsZSA9IHRleHREZWNvcmF0aW9uU3R5bGUtPmNvcHkoKTsKLSAgICAgICAgbmV3U3R5bGUt PnNldFByb3BlcnR5KENTU1Byb3BlcnR5VGV4dERlY29yYXRpb24sICJub25lIik7Ci0gICAgICAg IGFwcGx5VGV4dERlY29yYXRpb25TdHlsZShub2RlLCBuZXdTdHlsZS5nZXQoKSk7Ci0gICAgfQot Ci0gICAgcmV0dXJuIHRleHREZWNvcmF0aW9uU3R5bGUucmVsZWFzZSgpOwotfQotCiB2b2lkIEFw cGx5U3R5bGVDb21tYW5kOjphcHBseVRleHREZWNvcmF0aW9uU3R5bGUoTm9kZSAqbm9kZSwgQ1NT TXV0YWJsZVN0eWxlRGVjbGFyYXRpb24gKnN0eWxlKQogewogICAgIEFTU0VSVChub2RlKTsKQEAg LTE0NDMsNyArMTQxOCw3IEBAIHZvaWQgQXBwbHlTdHlsZUNvbW1hbmQ6OmFwcGx5VGV4dERlY29y YXQKICAgICAgICAgc3Vycm91bmROb2RlUmFuZ2VXaXRoRWxlbWVudChub2RlLCBub2RlLCBjcmVh dGVIVE1MRWxlbWVudChkb2N1bWVudCgpLCBzVGFnKSk7ICAgIAogfQogCi12b2lkIEFwcGx5U3R5 bGVDb21tYW5kOjpwdXNoRG93blRleHREZWNvcmF0aW9uU3R5bGVBcm91bmROb2RlKE5vZGUqIHRh cmdldE5vZGUsIGJvb2wgZm9yY2VOZWdhdGUpCit2b2lkIEFwcGx5U3R5bGVDb21tYW5kOjpwdXNo RG93blRleHREZWNvcmF0aW9uU3R5bGVBcm91bmROb2RlKE5vZGUqIHRhcmdldE5vZGUpCiB7CiAg ICAgQVNTRVJUKHRhcmdldE5vZGUpOwogICAgIE5vZGUqIGhpZ2hlc3RBbmNlc3RvciA9IGhpZ2hl c3RBbmNlc3RvcldpdGhUZXh0RGVjb3JhdGlvbih0YXJnZXROb2RlKTsKQEAgLTE0NTUsNyArMTQz MCw3IEBAIHZvaWQgQXBwbHlTdHlsZUNvbW1hbmQ6OnB1c2hEb3duVGV4dERlY28KICAgICB3aGls ZSAoY3VycmVudCAhPSB0YXJnZXROb2RlKSB7CiAgICAgICAgIEFTU0VSVChjdXJyZW50KTsKICAg ICAgICAgQVNTRVJUKGN1cnJlbnQtPmNvbnRhaW5zKHRhcmdldE5vZGUpKTsKLSAgICAgICAgUmVm UHRyPENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uPiBkZWNvcmF0aW9uID0gZm9yY2VOZWdhdGUg PyBleHRyYWN0QW5kTmVnYXRlVGV4dERlY29yYXRpb25TdHlsZShjdXJyZW50KSA6IGV4dHJhY3RU ZXh0RGVjb3JhdGlvblN0eWxlKGN1cnJlbnQpOworICAgICAgICBSZWZQdHI8Q1NTTXV0YWJsZVN0 eWxlRGVjbGFyYXRpb24+IGRlY29yYXRpb24gPSBleHRyYWN0VGV4dERlY29yYXRpb25TdHlsZShj dXJyZW50KTsKIAogICAgICAgICAvLyBUaGUgaW5uZXIgbG9vcCB3aWxsIGdvIHRocm91Z2ggY2hp bGRyZW4gb24gZWFjaCBsZXZlbAogICAgICAgICBOb2RlKiBjaGlsZCA9IGN1cnJlbnQtPmZpcnN0 Q2hpbGQoKTsKQEAgLTE0NzYsMzQgKzE0NTEsNiBAQCB2b2lkIEFwcGx5U3R5bGVDb21tYW5kOjpw dXNoRG93blRleHREZWNvCiAgICAgfQogfQogCi12b2lkIEFwcGx5U3R5bGVDb21tYW5kOjpwdXNo RG93blRleHREZWNvcmF0aW9uU3R5bGVBdEJvdW5kYXJpZXMoY29uc3QgUG9zaXRpb24gJnN0YXJ0 LCBjb25zdCBQb3NpdGlvbiAmZW5kKQotewotICAgIC8vIFdlIG5lZWQgdG8gd29yayBpbiB0d28g cGFzc2VzLiBGaXJzdCB3ZSBwdXNoIGRvd24gYW55IGlubGluZQotICAgIC8vIHN0eWxlcyB0aGF0 IHNldCB0ZXh0IGRlY29yYXRpb24uIFRoZW4gd2UgbG9vayBmb3IgYW55IHJlbWFpbmluZwotICAg IC8vIHN0eWxlcyAoY2F1c2VkIGJ5IHN0eWxlc2hlZXRzKSBhbmQgZXhwbGljaXRseSBuZWdhdGUg dGV4dAotICAgIC8vIGRlY29yYXRpb24gd2hpbGUgcHVzaGluZyBkb3duLgotCi0gICAgcHVzaERv d25UZXh0RGVjb3JhdGlvblN0eWxlQXJvdW5kTm9kZShzdGFydC5ub2RlKCksIGZhbHNlKTsKLSAg ICB1cGRhdGVMYXlvdXQoKTsKLSAgICBwdXNoRG93blRleHREZWNvcmF0aW9uU3R5bGVBcm91bmRO b2RlKHN0YXJ0Lm5vZGUoKSwgdHJ1ZSk7Ci0KLSAgICBwdXNoRG93blRleHREZWNvcmF0aW9uU3R5 bGVBcm91bmROb2RlKGVuZC5ub2RlKCksIGZhbHNlKTsKLSAgICB1cGRhdGVMYXlvdXQoKTsKLSAg ICBwdXNoRG93blRleHREZWNvcmF0aW9uU3R5bGVBcm91bmROb2RlKGVuZC5ub2RlKCksIHRydWUp OwotfQotCi0vLyBGSVhNRTogV2h5IGRvZXMgdGhpcyBleGlzdD8gIENhbGxlcnMgc2hvdWxkIGVp dGhlciB1c2UgbGFzdE9mZnNldEZvckVkaXRpbmcgb3IgbGFzdE9mZnNldEluTm9kZQotc3RhdGlj IGludCBtYXhSYW5nZU9mZnNldChOb2RlICpuKQotewotICAgIGlmIChuLT5vZmZzZXRJbkNoYXJh Y3RlcnMoKSkKLSAgICAgICAgcmV0dXJuIG4tPm1heENoYXJhY3Rlck9mZnNldCgpOwotCi0gICAg aWYgKG4tPmlzRWxlbWVudE5vZGUoKSkKLSAgICAgICAgcmV0dXJuIG4tPmNoaWxkTm9kZUNvdW50 KCk7Ci0KLSAgICByZXR1cm4gMTsKLX0KLQogdm9pZCBBcHBseVN0eWxlQ29tbWFuZDo6cmVtb3Zl SW5saW5lU3R5bGUoUGFzc1JlZlB0cjxDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbj4gc3R5bGUs IGNvbnN0IFBvc2l0aW9uICZzdGFydCwgY29uc3QgUG9zaXRpb24gJmVuZCkKIHsKICAgICBBU1NF UlQoc3RhcnQuaXNOb3ROdWxsKCkpOwpAQCAtMTUxNSw3ICsxNDYyLDggQEAgdm9pZCBBcHBseVN0 eWxlQ29tbWFuZDo6cmVtb3ZlSW5saW5lU3R5bAogICAgIFJlZlB0cjxDU1NWYWx1ZT4gdGV4dERl Y29yYXRpb25TcGVjaWFsUHJvcGVydHkgPSBzdHlsZS0+Z2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQ cm9wZXJ0eVdlYmtpdFRleHREZWNvcmF0aW9uc0luRWZmZWN0KTsKIAogICAgIGlmICh0ZXh0RGVj b3JhdGlvblNwZWNpYWxQcm9wZXJ0eSkgewotICAgICAgICBwdXNoRG93blRleHREZWNvcmF0aW9u U3R5bGVBdEJvdW5kYXJpZXMoc3RhcnQuZG93bnN0cmVhbSgpLCBlbmQudXBzdHJlYW0oKSk7Cisg ICAgICAgIHB1c2hEb3duVGV4dERlY29yYXRpb25TdHlsZUFyb3VuZE5vZGUoc3RhcnQuZG93bnN0 cmVhbSgpLm5vZGUoKSk7CisgICAgICAgIHB1c2hEb3duVGV4dERlY29yYXRpb25TdHlsZUFyb3Vu ZE5vZGUoZW5kLnVwc3RyZWFtKCkubm9kZSgpKTsKICAgICAgICAgc3R5bGUgPSBzdHlsZS0+Y29w eSgpOwogICAgICAgICBzdHlsZS0+c2V0UHJvcGVydHkoQ1NTUHJvcGVydHlUZXh0RGVjb3JhdGlv biwgdGV4dERlY29yYXRpb25TcGVjaWFsUHJvcGVydHktPmNzc1RleHQoKSwgc3R5bGUtPmdldFBy b3BlcnR5UHJpb3JpdHkoQ1NTUHJvcGVydHlXZWJraXRUZXh0RGVjb3JhdGlvbnNJbkVmZmVjdCkp OwogICAgIH0KQEAgLTE1NDUsOCArMTQ5Myw4IEBAIHZvaWQgQXBwbHlTdHlsZUNvbW1hbmQ6OnJl bW92ZUlubGluZVN0eWwKICAgICAgICAgICAgICAgICAgICAgLy8gU2luY2UgZWxlbSBtdXN0IGhh dmUgYmVlbiBmdWxseSBzZWxlY3RlZCwgYW5kIGl0IGlzIGF0IHRoZSBlbmQKICAgICAgICAgICAg ICAgICAgICAgLy8gb2YgdGhlIHNlbGVjdGlvbiwgaXQgaXMgY2xlYXIgd2UgY2FuIHNldCB0aGUg bmV3IGUgb2Zmc2V0IHRvCiAgICAgICAgICAgICAgICAgICAgIC8vIHRoZSBtYXggcmFuZ2Ugb2Zm c2V0IG9mIHByZXYuCi0gICAgICAgICAgICAgICAgICAgIEFTU0VSVChlLmRlcHJlY2F0ZWRFZGl0 aW5nT2Zmc2V0KCkgPj0gbWF4UmFuZ2VPZmZzZXQoZS5ub2RlKCkpKTsKLSAgICAgICAgICAgICAg ICAgICAgZSA9IFBvc2l0aW9uKHByZXYsIG1heFJhbmdlT2Zmc2V0KHByZXYpKTsKKyAgICAgICAg ICAgICAgICAgICAgQVNTRVJUKGUuZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQoKSA+PSBsYXN0T2Zm c2V0Rm9yRWRpdGluZyhlLm5vZGUoKSkpOworICAgICAgICAgICAgICAgICAgICBlID0gUG9zaXRp b24ocHJldiwgbGFzdE9mZnNldEZvckVkaXRpbmcocHJldikpOwogICAgICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIH0KICAgICAgICAgfQpJbmRleDogV2ViQ29yZS9lZGl0aW5nL0FwcGx5U3R5 bGVDb21tYW5kLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9lZGl0aW5nL0FwcGx5U3R5bGVDb21t YW5kLmgJKHJldmlzaW9uIDY0NTYwKQorKysgV2ViQ29yZS9lZGl0aW5nL0FwcGx5U3R5bGVDb21t YW5kLmgJKHdvcmtpbmcgY29weSkKQEAgLTgyLDExICs4Miw5IEBAIHByaXZhdGU6CiAgICAgYm9v bCBub2RlRnVsbHlTZWxlY3RlZChOb2RlKiwgY29uc3QgUG9zaXRpb24mIHN0YXJ0LCBjb25zdCBQ b3NpdGlvbiYgZW5kKSBjb25zdDsKICAgICBib29sIG5vZGVGdWxseVVuc2VsZWN0ZWQoTm9kZSos IGNvbnN0IFBvc2l0aW9uJiBzdGFydCwgY29uc3QgUG9zaXRpb24mIGVuZCkgY29uc3Q7CiAgICAg UGFzc1JlZlB0cjxDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbj4gZXh0cmFjdFRleHREZWNvcmF0 aW9uU3R5bGUoTm9kZSopOwotICAgIFBhc3NSZWZQdHI8Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRp b24+IGV4dHJhY3RBbmROZWdhdGVUZXh0RGVjb3JhdGlvblN0eWxlKE5vZGUqKTsKICAgICB2b2lk IGFwcGx5VGV4dERlY29yYXRpb25TdHlsZShOb2RlKiwgQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRp b24gKnN0eWxlKTsKLSAgICB2b2lkIHB1c2hEb3duVGV4dERlY29yYXRpb25TdHlsZUFyb3VuZE5v ZGUoTm9kZSosIGJvb2wgZm9yY2VOZWdhdGUpOwotICAgIHZvaWQgcHVzaERvd25UZXh0RGVjb3Jh dGlvblN0eWxlQXRCb3VuZGFyaWVzKGNvbnN0IFBvc2l0aW9uJiBzdGFydCwgY29uc3QgUG9zaXRp b24mIGVuZCk7Ci0gICAgCisgICAgdm9pZCBwdXNoRG93blRleHREZWNvcmF0aW9uU3R5bGVBcm91 bmROb2RlKE5vZGUqKTsKKwogICAgIC8vIHN0eWxlLWFwcGxpY2F0aW9uIGhlbHBlcnMKICAgICB2 b2lkIGFwcGx5QmxvY2tTdHlsZShDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbiopOwogICAgIHZv aWQgYXBwbHlSZWxhdGl2ZUZvbnRTdHlsZUNoYW5nZShDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlv biopOwo=