64416 2011-07-12 18:02:12 -0700 Don't reuse the last InsertTextCommand 2011-07-13 10:55:24 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 64414 1 rniwa rniwa darin enrica justin.garcia leviw morrita tkent oldest_to_newest 436127 0 rniwa 2011-07-12 18:02:12 -0700 It seems unnecessary to reuse the last InsertTextCommand in TypingCommand. Changing the interface of InsertTextCommand to use doApply will make fixing the bug 64414 easier. 436132 1 100601 rniwa 2011-07-12 18:09:30 -0700 Created attachment 100601 Patch 436254 2 100601 morrita 2011-07-12 22:34:25 -0700 Comment on attachment 100601 Patch Wow, I thought this reuse is for handling undo. But it isn't true.... 436275 3 rniwa 2011-07-12 23:22:14 -0700 (In reply to comment #2) > (From update of attachment 100601 [details]) > Wow, I thought this reuse is for handling undo. But it isn't true.... Undo/Redo is taken care by reusing TypingCommand. I'm guessing that this is an artifact of old days when InsertTextCommand was used differently than it is today. 436293 4 100601 justin.garcia 2011-07-13 00:41:13 -0700 Comment on attachment 100601 Patch Looks like you could get rid of: virtual bool isInsertTextCommand() const; as it is now unused. 436294 5 rniwa 2011-07-13 00:42:57 -0700 Thanks for the review! (In reply to comment #4) > (From update of attachment 100601 [details]) > Looks like you could get rid of: > > virtual bool isInsertTextCommand() const; > > as it is now unused. Oh, you're right. I'll do that before I land. 436524 6 rniwa 2011-07-13 10:55:24 -0700 Committed r90933: <http://trac.webkit.org/changeset/90933> 100601 2011-07-12 18:09:30 -0700 2011-07-13 00:41:12 -0700 Patch bug-64416-20110712180929.patch text/plain 9852 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkwODc1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDctMTIgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRG9uJ3QgcmV1c2UgdGhlIGxhc3Qg SW5zZXJ0VGV4dENvbW1hbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTY0NDE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhpcyBwYXRjaCBtYWtlcyB0aGUgaW50ZXJmYWNlIG9mIEluc2VydFRleHRDb21t YW5kIGxlc3MgZm9yZWlnbi4gSXQgbm93IHRha2VzIGFyZ3VtZW50cyBpbgorICAgICAgICBpdHMg Y29uc3RydWN0b3IgYW5kIGV4ZWN1dGVzIHRoZSBjb21tYW5kIGluIGRvQXBwbHkgbGlrZSBvdGhl ciBlZGl0IGNvbW1hbmRzLgorCisgICAgICAgICogZWRpdGluZy9Db21wb3NpdGVFZGl0Q29tbWFu ZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb21wb3NpdGVFZGl0Q29tbWFuZDo6YXBwbHlDb21t YW5kVG9Db21wb3NpdGUpOiBBZGRlZC4KKyAgICAgICAgKiBlZGl0aW5nL0NvbXBvc2l0ZUVkaXRD b21tYW5kLmg6CisgICAgICAgICogZWRpdGluZy9JbnNlcnRUZXh0Q29tbWFuZC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbnNlcnRUZXh0Q29tbWFuZDo6SW5zZXJ0VGV4dENvbW1hbmQpOiBUYWtl cyBhcmd1bWVudHMgaW5wdXQgdXNlZCB0byB0YWtlLgorICAgICAgICAoV2ViQ29yZTo6SW5zZXJ0 VGV4dENvbW1hbmQ6OmRvQXBwbHkpOiBSZW5hbWVkIGZyb20gaW5wdXQuCisgICAgICAgICogZWRp dGluZy9JbnNlcnRUZXh0Q29tbWFuZC5oOgorICAgICAgICAoV2ViQ29yZTo6SW5zZXJ0VGV4dENv bW1hbmQ6OmNyZWF0ZSk6IFRha2VzIGFyZ3VtZW50cyBpbnB1dCB1c2VkIHRvIHRha2UuCisgICAg ICAgICogZWRpdGluZy9UeXBpbmdDb21tYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlR5cGlu Z0NvbW1hbmQ6Omluc2VydFRleHRSdW5XaXRob3V0TmV3bGluZXMpOiBDcmVhdGVzIEluc2VydFRl eHRDb21tYW5kLgorCiAyMDExLTA3LTEyICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBDaHJvbWl1bSB3aW4gYnVpbGQgZml4LgpJbmRl eDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9Db21wb3NpdGVFZGl0Q29tbWFuZC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9Db21wb3NpdGVFZGl0Q29tbWFuZC5jcHAJ KHJldmlzaW9uIDkwODUyKQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9Db21wb3NpdGVFZGl0 Q29tbWFuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMyw2ICsxMDMsMTcgQEAgdm9pZCBDb21w b3NpdGVFZGl0Q29tbWFuZDo6YXBwbHlDb21tYW5kVAogICAgIG1fY29tbWFuZHMuYXBwZW5kKGNt ZCk7CiB9CiAKK3ZvaWQgQ29tcG9zaXRlRWRpdENvbW1hbmQ6OmFwcGx5Q29tbWFuZFRvQ29tcG9z aXRlKFBhc3NSZWZQdHI8Q29tcG9zaXRlRWRpdENvbW1hbmQ+IGNvbW1hbmQsIGNvbnN0IFZpc2li bGVTZWxlY3Rpb24mIHNlbGVjdGlvbikKK3sKKyAgICBjb21tYW5kLT5zZXRQYXJlbnQodGhpcyk7 CisgICAgaWYgKHNlbGVjdGlvbiAhPSBjb21tYW5kLT5lbmRpbmdTZWxlY3Rpb24oKSkgeworICAg ICAgICBjb21tYW5kLT5zZXRTdGFydGluZ1NlbGVjdGlvbihzZWxlY3Rpb24pOworICAgICAgICBj b21tYW5kLT5zZXRFbmRpbmdTZWxlY3Rpb24oc2VsZWN0aW9uKTsKKyAgICB9CisgICAgY29tbWFu ZC0+YXBwbHkoKTsKKyAgICBtX2NvbW1hbmRzLmFwcGVuZChjb21tYW5kKTsKK30KKwogdm9pZCBD b21wb3NpdGVFZGl0Q29tbWFuZDo6YXBwbHlTdHlsZShjb25zdCBFZGl0aW5nU3R5bGUqIHN0eWxl LCBFZGl0QWN0aW9uIGVkaXRpbmdBY3Rpb24pCiB7CiAgICAgYXBwbHlDb21tYW5kVG9Db21wb3Np dGUoQXBwbHlTdHlsZUNvbW1hbmQ6OmNyZWF0ZShkb2N1bWVudCgpLCBzdHlsZSwgZWRpdGluZ0Fj dGlvbikpOwpJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9Db21wb3NpdGVFZGl0Q29tbWFu ZC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRpdENv bW1hbmQuaAkocmV2aXNpb24gOTA4NTIpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0NvbXBv c2l0ZUVkaXRDb21tYW5kLmgJKHdvcmtpbmcgY29weSkKQEAgLTUxLDYgKzUxLDcgQEAgcHJvdGVj dGVkOgogICAgIC8vCiAgICAgdm9pZCBhcHBlbmROb2RlKFBhc3NSZWZQdHI8Tm9kZT4sIFBhc3NS ZWZQdHI8Q29udGFpbmVyTm9kZT4gcGFyZW50KTsKICAgICB2b2lkIGFwcGx5Q29tbWFuZFRvQ29t cG9zaXRlKFBhc3NSZWZQdHI8RWRpdENvbW1hbmQ+KTsKKyAgICB2b2lkIGFwcGx5Q29tbWFuZFRv Q29tcG9zaXRlKFBhc3NSZWZQdHI8Q29tcG9zaXRlRWRpdENvbW1hbmQ+LCBjb25zdCBWaXNpYmxl U2VsZWN0aW9uJik7CiAgICAgdm9pZCBhcHBseVN0eWxlKGNvbnN0IEVkaXRpbmdTdHlsZSosIEVk aXRBY3Rpb24gPSBFZGl0QWN0aW9uQ2hhbmdlQXR0cmlidXRlcyk7CiAgICAgdm9pZCBhcHBseVN0 eWxlKGNvbnN0IEVkaXRpbmdTdHlsZSosIGNvbnN0IFBvc2l0aW9uJiBzdGFydCwgY29uc3QgUG9z aXRpb24mIGVuZCwgRWRpdEFjdGlvbiA9IEVkaXRBY3Rpb25DaGFuZ2VBdHRyaWJ1dGVzKTsKICAg ICB2b2lkIGFwcGx5U3R5bGVkRWxlbWVudChQYXNzUmVmUHRyPEVsZW1lbnQ+KTsKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0VGV4dENvbW1hbmQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0VGV4dENvbW1hbmQuY3BwCShyZXZpc2lvbiA5 MDg1MikKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0VGV4dENvbW1hbmQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zOCwxMiArMzgsMTEgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog Ci1JbnNlcnRUZXh0Q29tbWFuZDo6SW5zZXJ0VGV4dENvbW1hbmQoRG9jdW1lbnQgKmRvY3VtZW50 KSAKK0luc2VydFRleHRDb21tYW5kOjpJbnNlcnRUZXh0Q29tbWFuZChEb2N1bWVudCogZG9jdW1l bnQsIGNvbnN0IFN0cmluZyYgdGV4dCwgYm9vbCBzZWxlY3RJbnNlcnRlZFRleHQsIFJlYmFsYW5j ZVR5cGUgcmViYWxhbmNlVHlwZSkgCiAgICAgOiBDb21wb3NpdGVFZGl0Q29tbWFuZChkb2N1bWVu dCkKLXsKLX0KLQotdm9pZCBJbnNlcnRUZXh0Q29tbWFuZDo6ZG9BcHBseSgpCisgICAgLCBtX3Rl eHQodGV4dCkKKyAgICAsIG1fc2VsZWN0SW5zZXJ0ZWRUZXh0KHNlbGVjdEluc2VydGVkVGV4dCkK KyAgICAsIG1fcmViYWxhbmNlVHlwZShyZWJhbGFuY2VUeXBlKQogewogfQogCkBAIC05NSw5ICs5 NCw5IEBAIGJvb2wgSW5zZXJ0VGV4dENvbW1hbmQ6OnBlcmZvcm1Ucml2aWFsUmUKICAgICByZXR1 cm4gdHJ1ZTsKIH0KIAotdm9pZCBJbnNlcnRUZXh0Q29tbWFuZDo6aW5wdXQoY29uc3QgU3RyaW5n JiB0ZXh0LCBib29sIHNlbGVjdEluc2VydGVkVGV4dCwgUmViYWxhbmNlVHlwZSB3aGl0ZXNwYWNl UmViYWxhbmNlKQordm9pZCBJbnNlcnRUZXh0Q29tbWFuZDo6ZG9BcHBseSgpCiB7Ci0gICAgQVNT RVJUKHRleHQuZmluZCgnXG4nKSA9PSBub3RGb3VuZCk7CisgICAgQVNTRVJUKG1fdGV4dC5maW5k KCdcbicpID09IG5vdEZvdW5kKTsKIAogICAgIGlmICghZW5kaW5nU2VsZWN0aW9uKCkuaXNOb25P cnBoYW5lZENhcmV0T3JSYW5nZSgpKQogICAgICAgICByZXR1cm47CkBAIC0xMDUsNyArMTA0LDcg QEAgdm9pZCBJbnNlcnRUZXh0Q29tbWFuZDo6aW5wdXQoY29uc3QgU3RyaQogICAgIC8vIERlbGV0 ZSB0aGUgY3VycmVudCBzZWxlY3Rpb24uCiAgICAgLy8gRklYTUU6IFRoaXMgZGVsZXRlIG9wZXJh dGlvbiBibG93cyBhd2F5IHRoZSB0eXBpbmcgc3R5bGUuCiAgICAgaWYgKGVuZGluZ1NlbGVjdGlv bigpLmlzUmFuZ2UoKSkgewotICAgICAgICBpZiAocGVyZm9ybVRyaXZpYWxSZXBsYWNlKHRleHQs IHNlbGVjdEluc2VydGVkVGV4dCkpCisgICAgICAgIGlmIChwZXJmb3JtVHJpdmlhbFJlcGxhY2Uo bV90ZXh0LCBtX3NlbGVjdEluc2VydGVkVGV4dCkpCiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIGRlbGV0ZVNlbGVjdGlvbihmYWxzZSwgdHJ1ZSwgdHJ1ZSwgZmFsc2UpOwogICAgIH0KQEAg LTE0NCwxMyArMTQzLDEzIEBAIHZvaWQgSW5zZXJ0VGV4dENvbW1hbmQ6OmlucHV0KGNvbnN0IFN0 cmkKICAgICAKICAgICBQb3NpdGlvbiBlbmRQb3NpdGlvbjsKICAgICAKLSAgICBpZiAodGV4dCA9 PSAiXHQiKSB7CisgICAgaWYgKG1fdGV4dCA9PSAiXHQiKSB7CiAgICAgICAgIGVuZFBvc2l0aW9u ID0gaW5zZXJ0VGFiKHN0YXJ0UG9zaXRpb24pOwogICAgICAgICBzdGFydFBvc2l0aW9uID0gZW5k UG9zaXRpb24ucHJldmlvdXMoKTsKICAgICAgICAgaWYgKHBsYWNlaG9sZGVyLmlzTm90TnVsbCgp KQogICAgICAgICAgICAgcmVtb3ZlUGxhY2Vob2xkZXJBdChwbGFjZWhvbGRlcik7CiAgICAgfSBl bHNlIHsKLSAgICAgICAgLy8gTWFrZSBzdXJlIHRoZSBkb2N1bWVudCBpcyBzZXQgdXAgdG8gcmVj ZWl2ZSB0ZXh0CisgICAgICAgIC8vIE1ha2Ugc3VyZSB0aGUgZG9jdW1lbnQgaXMgc2V0IHVwIHRv IHJlY2VpdmUgbV90ZXh0CiAgICAgICAgIHN0YXJ0UG9zaXRpb24gPSBwb3NpdGlvbkluc2lkZVRl eHROb2RlKHN0YXJ0UG9zaXRpb24pOwogICAgICAgICBBU1NFUlQoc3RhcnRQb3NpdGlvbi5hbmNo b3JUeXBlKCkgPT0gUG9zaXRpb246OlBvc2l0aW9uSXNPZmZzZXRJbkFuY2hvcik7CiAgICAgICAg IEFTU0VSVChzdGFydFBvc2l0aW9uLmNvbnRhaW5lck5vZGUoKSk7CkBAIC0xNjAsMTcgKzE1OSwx NyBAQCB2b2lkIEluc2VydFRleHRDb21tYW5kOjppbnB1dChjb25zdCBTdHJpCiAgICAgICAgIFJl ZlB0cjxUZXh0PiB0ZXh0Tm9kZSA9IHN0YXJ0UG9zaXRpb24uY29udGFpbmVyVGV4dCgpOwogICAg ICAgICBjb25zdCB1bnNpZ25lZCBvZmZzZXQgPSBzdGFydFBvc2l0aW9uLm9mZnNldEluQ29udGFp bmVyTm9kZSgpOwogCi0gICAgICAgIGluc2VydFRleHRJbnRvTm9kZSh0ZXh0Tm9kZSwgb2Zmc2V0 LCB0ZXh0KTsKLSAgICAgICAgZW5kUG9zaXRpb24gPSBQb3NpdGlvbih0ZXh0Tm9kZSwgb2Zmc2V0 ICsgdGV4dC5sZW5ndGgoKSk7CisgICAgICAgIGluc2VydFRleHRJbnRvTm9kZSh0ZXh0Tm9kZSwg b2Zmc2V0LCBtX3RleHQpOworICAgICAgICBlbmRQb3NpdGlvbiA9IFBvc2l0aW9uKHRleHROb2Rl LCBvZmZzZXQgKyBtX3RleHQubGVuZ3RoKCkpOwogCi0gICAgICAgIGlmICh3aGl0ZXNwYWNlUmVi YWxhbmNlID09IFJlYmFsYW5jZUxlYWRpbmdBbmRUcmFpbGluZ1doaXRlc3BhY2VzKSB7CisgICAg ICAgIGlmIChtX3JlYmFsYW5jZVR5cGUgPT0gUmViYWxhbmNlTGVhZGluZ0FuZFRyYWlsaW5nV2hp dGVzcGFjZXMpIHsKICAgICAgICAgICAgIC8vIFRoZSBpbnNlcnRpb24gbWF5IHJlcXVpcmUgYWRq dXN0aW5nIGFkamFjZW50IHdoaXRlc3BhY2UsIGlmIGl0IGlzIHByZXNlbnQuCiAgICAgICAgICAg ICByZWJhbGFuY2VXaGl0ZXNwYWNlQXQoZW5kUG9zaXRpb24pOwogICAgICAgICAgICAgLy8gUmVi YWxhbmNpbmcgb24gYm90aCBzaWRlcyBpc24ndCBuZWNlc3NhcnkgaWYgd2UndmUgaW5zZXJ0ZWQg b25seSBzcGFjZXMuCi0gICAgICAgICAgICBpZiAoIXNob3VsZFJlYmFsYW5jZUxlYWRpbmdXaGl0 ZXNwYWNlRm9yKHRleHQpKQorICAgICAgICAgICAgaWYgKCFzaG91bGRSZWJhbGFuY2VMZWFkaW5n V2hpdGVzcGFjZUZvcihtX3RleHQpKQogICAgICAgICAgICAgICAgIHJlYmFsYW5jZVdoaXRlc3Bh Y2VBdChzdGFydFBvc2l0aW9uKTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIEFTU0VS VCh3aGl0ZXNwYWNlUmViYWxhbmNlID09IFJlYmFsYW5jZUFsbFdoaXRlc3BhY2VzKTsKKyAgICAg ICAgICAgIEFTU0VSVChtX3JlYmFsYW5jZVR5cGUgPT0gUmViYWxhbmNlQWxsV2hpdGVzcGFjZXMp OwogICAgICAgICAgICAgaWYgKGNhblJlYmFsYW5jZShzdGFydFBvc2l0aW9uKSAmJiBjYW5SZWJh bGFuY2UoZW5kUG9zaXRpb24pKQogICAgICAgICAgICAgICAgIHJlYmFsYW5jZVdoaXRlc3BhY2VP blRleHRTdWJzdHJpbmcodGV4dE5vZGUsIHN0YXJ0UG9zaXRpb24ub2Zmc2V0SW5Db250YWluZXJO b2RlKCksIGVuZFBvc2l0aW9uLm9mZnNldEluQ29udGFpbmVyTm9kZSgpKTsKICAgICAgICAgfQpA QCAtMTkwLDcgKzE4OSw3IEBAIHZvaWQgSW5zZXJ0VGV4dENvbW1hbmQ6OmlucHV0KGNvbnN0IFN0 cmkKICAgICAgICAgICAgIGFwcGx5U3R5bGUodHlwaW5nU3R5bGUuZ2V0KCkpOwogICAgIH0KIAot ICAgIGlmICghc2VsZWN0SW5zZXJ0ZWRUZXh0KQorICAgIGlmICghbV9zZWxlY3RJbnNlcnRlZFRl eHQpCiAgICAgICAgIHNldEVuZGluZ1NlbGVjdGlvbihWaXNpYmxlU2VsZWN0aW9uKGVuZGluZ1Nl bGVjdGlvbigpLmVuZCgpLCBlbmRpbmdTZWxlY3Rpb24oKS5hZmZpbml0eSgpKSk7CiB9CiAKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0VGV4dENvbW1hbmQuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0luc2VydFRleHRDb21tYW5kLmgJKHJldmlzaW9u IDkwODUyKQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9JbnNlcnRUZXh0Q29tbWFuZC5oCSh3 b3JraW5nIGNvcHkpCkBAIC0zNywxOSArMzcsMTggQEAgcHVibGljOgogICAgICAgICBSZWJhbGFu Y2VBbGxXaGl0ZXNwYWNlcwogICAgIH07CiAKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbnNlcnRU ZXh0Q29tbWFuZD4gY3JlYXRlKERvY3VtZW50KiBkb2N1bWVudCkKKyAgICBzdGF0aWMgUGFzc1Jl ZlB0cjxJbnNlcnRUZXh0Q29tbWFuZD4gY3JlYXRlKERvY3VtZW50KiBkb2N1bWVudCwgY29uc3Qg U3RyaW5nJiB0ZXh0LCBib29sIHNlbGVjdEluc2VydGVkVGV4dCA9IGZhbHNlLAorICAgICAgICBS ZWJhbGFuY2VUeXBlIHJlYmFsYW5jZVR5cGUgPSBSZWJhbGFuY2VMZWFkaW5nQW5kVHJhaWxpbmdX aGl0ZXNwYWNlcykKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgSW5zZXJ0VGV4 dENvbW1hbmQoZG9jdW1lbnQpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBJbnNlcnRU ZXh0Q29tbWFuZChkb2N1bWVudCwgdGV4dCwgc2VsZWN0SW5zZXJ0ZWRUZXh0LCByZWJhbGFuY2VU eXBlKSk7CiAgICAgfQogCi0gICAgdm9pZCBpbnB1dChjb25zdCBTdHJpbmcmIHRleHQsIGJvb2wg c2VsZWN0SW5zZXJ0ZWRUZXh0ID0gZmFsc2UsIFJlYmFsYW5jZVR5cGUgPSBSZWJhbGFuY2VMZWFk aW5nQW5kVHJhaWxpbmdXaGl0ZXNwYWNlcyk7Ci0KIHByaXZhdGU6CiAKLSAgICBJbnNlcnRUZXh0 Q29tbWFuZChEb2N1bWVudCopOworICAgIEluc2VydFRleHRDb21tYW5kKERvY3VtZW50KiwgY29u c3QgU3RyaW5nJiB0ZXh0LCBib29sIHNlbGVjdEluc2VydGVkVGV4dCwgUmViYWxhbmNlVHlwZSk7 CiAKICAgICB2b2lkIGRlbGV0ZUNoYXJhY3RlcigpOwotICAgIAorCiAgICAgdmlydHVhbCB2b2lk IGRvQXBwbHkoKTsKICAgICB2aXJ0dWFsIGJvb2wgaXNJbnNlcnRUZXh0Q29tbWFuZCgpIGNvbnN0 OwogCkBAIC01OSw2ICs1OCwxMCBAQCBwcml2YXRlOgogICAgIGJvb2wgcGVyZm9ybVRyaXZpYWxS ZXBsYWNlKGNvbnN0IFN0cmluZyYsIGJvb2wgc2VsZWN0SW5zZXJ0ZWRUZXh0KTsKIAogICAgIGZy aWVuZCBjbGFzcyBUeXBpbmdDb21tYW5kOworCisgICAgU3RyaW5nIG1fdGV4dDsKKyAgICBib29s IG1fc2VsZWN0SW5zZXJ0ZWRUZXh0OworICAgIFJlYmFsYW5jZVR5cGUgbV9yZWJhbGFuY2VUeXBl OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNvcmUvZWRp dGluZy9UeXBpbmdDb21tYW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL1R5cGluZ0NvbW1hbmQuY3BwCShyZXZpc2lvbiA5MDg1MikKKysrIFNvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvVHlwaW5nQ29tbWFuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM5MSwyMiArMzkx LDExIEBAIHZvaWQgVHlwaW5nQ29tbWFuZDo6aW5zZXJ0VGV4dChjb25zdCBTdHIKIAogdm9pZCBU eXBpbmdDb21tYW5kOjppbnNlcnRUZXh0UnVuV2l0aG91dE5ld2xpbmVzKGNvbnN0IFN0cmluZyAm dGV4dCwgYm9vbCBzZWxlY3RJbnNlcnRlZFRleHQpCiB7Ci0gICAgUmVmUHRyPEluc2VydFRleHRD b21tYW5kPiBjb21tYW5kOwotICAgIGlmICghZG9jdW1lbnQoKS0+ZnJhbWUoKS0+c2VsZWN0aW9u KCktPnR5cGluZ1N0eWxlKCkgJiYgIW1fY29tbWFuZHMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIEVk aXRDb21tYW5kKiBsYXN0Q29tbWFuZCA9IG1fY29tbWFuZHMubGFzdCgpLmdldCgpOwotICAgICAg ICBpZiAobGFzdENvbW1hbmQtPmlzSW5zZXJ0VGV4dENvbW1hbmQoKSkKLSAgICAgICAgICAgIGNv bW1hbmQgPSBzdGF0aWNfY2FzdDxJbnNlcnRUZXh0Q29tbWFuZCo+KGxhc3RDb21tYW5kKTsKLSAg ICB9Ci0gICAgaWYgKCFjb21tYW5kKSB7Ci0gICAgICAgIGNvbW1hbmQgPSBJbnNlcnRUZXh0Q29t bWFuZDo6Y3JlYXRlKGRvY3VtZW50KCkpOwotICAgICAgICBhcHBseUNvbW1hbmRUb0NvbXBvc2l0 ZShjb21tYW5kKTsKLSAgICB9Ci0gICAgaWYgKGVuZGluZ1NlbGVjdGlvbigpICE9IGNvbW1hbmQt PmVuZGluZ1NlbGVjdGlvbigpKSB7Ci0gICAgICAgIGNvbW1hbmQtPnNldFN0YXJ0aW5nU2VsZWN0 aW9uKGVuZGluZ1NlbGVjdGlvbigpKTsKLSAgICAgICAgY29tbWFuZC0+c2V0RW5kaW5nU2VsZWN0 aW9uKGVuZGluZ1NlbGVjdGlvbigpKTsKLSAgICB9Ci0gICAgY29tbWFuZC0+aW5wdXQodGV4dCwg c2VsZWN0SW5zZXJ0ZWRUZXh0LCAKLSAgICAgICAgICAgICAgICAgICBtX2NvbXBvc2l0aW9uVHlw ZSA9PSBUZXh0Q29tcG9zaXRpb25Ob25lID8gSW5zZXJ0VGV4dENvbW1hbmQ6OlJlYmFsYW5jZUxl YWRpbmdBbmRUcmFpbGluZ1doaXRlc3BhY2VzIDogSW5zZXJ0VGV4dENvbW1hbmQ6OlJlYmFsYW5j ZUFsbFdoaXRlc3BhY2VzKTsKKyAgICBSZWZQdHI8SW5zZXJ0VGV4dENvbW1hbmQ+IGNvbW1hbmQg PSBJbnNlcnRUZXh0Q29tbWFuZDo6Y3JlYXRlKGRvY3VtZW50KCksIHRleHQsIHNlbGVjdEluc2Vy dGVkVGV4dCwKKyAgICAgICAgbV9jb21wb3NpdGlvblR5cGUgPT0gVGV4dENvbXBvc2l0aW9uTm9u ZSA/IEluc2VydFRleHRDb21tYW5kOjpSZWJhbGFuY2VMZWFkaW5nQW5kVHJhaWxpbmdXaGl0ZXNw YWNlcyA6IEluc2VydFRleHRDb21tYW5kOjpSZWJhbGFuY2VBbGxXaGl0ZXNwYWNlcyk7CisKKyAg ICBhcHBseUNvbW1hbmRUb0NvbXBvc2l0ZShjb21tYW5kLCBlbmRpbmdTZWxlY3Rpb24oKSk7CisK ICAgICB0eXBpbmdBZGRlZFRvT3BlbkNvbW1hbmQoSW5zZXJ0VGV4dCk7CiB9CiAK