55352 2011-02-27 22:34:37 -0800 Stop calling deprecatedNode and deprecatedEditingOffset in InsertTextCommand 2011-03-03 20:59:01 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 52099 1 rniwa webkit-unassigned darin eric ojan tkent tony oldest_to_newest 358897 0 rniwa 2011-02-27 22:34:37 -0800 This is a cleanup 358903 1 84020 rniwa 2011-02-27 22:55:03 -0800 Created attachment 84020 cleanup 362046 2 84020 tkent 2011-03-03 16:17:14 -0800 Comment on attachment 84020 cleanup This looks good. 362241 3 rniwa 2011-03-03 20:58:33 -0800 Committed r80317: <http://trac.webkit.org/changeset/80317> 362242 4 rniwa 2011-03-03 20:59:01 -0800 Thanks for the review! 84020 2011-02-27 22:55:03 -0800 2011-03-03 16:17:14 -0800 cleanup bug-55352-20110228155501.patch text/plain 8346 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc5ODQxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDItMjcgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgU3RvcCBjYWxsaW5nIGRlcHJlY2F0ZWROb2RlIGFuZCBkZXByZWNh dGVkRWRpdGluZ09mZnNldCBpbiBJbnNlcnRUZXh0Q29tbWFuZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUzNTIKKworICAgICAgICBTdG9wcGVkIGNh bGxpbmcgZGVwcmVjYXRlZE5vZGUgYW5kIGRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0IGluIHRoZSBm b2xsb3dpbmcgZnVuY3Rpb25zOgorCisgICAgICAgICogZWRpdGluZy9Db21wb3NpdGVFZGl0Q29t bWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb21wb3NpdGVFZGl0Q29tbWFuZDo6cG9zaXRp b25PdXRzaWRlVGFiU3Bhbik6IFRha2VzIGNhcmUgb2YgYWxsIHR5cGVzIG9mIHBvc2l0aW9ucyBh bmQKKyAgICAgICAgbm8gbG9uZ2VyIGNhbGxzIGRlcHJlY2F0ZWQgZnVuY3Rpb25zLgorICAgICAg ICAqIGVkaXRpbmcvSW5zZXJ0VGV4dENvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5z ZXJ0VGV4dENvbW1hbmQ6OnBvc2l0aW9uSW5zaWRlVGV4dE5vZGUpOiBEaXR0bzsgcmVuYW1lZCBm cm9tIHByZXBhcmVGb3JUZXh0SW5zZXJ0aW9uLgorICAgICAgICBDaGVjayBpZiB0aGUgdGV4dCBu b2RlIGluc2lkZSBhIHRhYiBzcGFuIGJlZm9yZSBjaGVja2luZyBpZiB0aGUgY29udGFpbmVyIG5v ZGUgaXMgYSB0ZXh0IG5vZGUKKyAgICAgICAgYmVjYXVzZSB0aGUgcG9zaXRpb24gYmVmb3JlIG9y IGFmdGVyIGEgdGV4dCBub2RlIGNhbiBzdGlsbCBiZSBpbnNpZGUgYSB0YWIgc3Bhbi4KKyAgICAg ICAgKFdlYkNvcmU6Okluc2VydFRleHRDb21tYW5kOjppbnB1dCk6IE5vIGxvbmdlciBjYWxscyBk ZXByZWNhdGVkIGZ1bmN0aW9ucy4KKyAgICAgICAgKiBlZGl0aW5nL0luc2VydFRleHRDb21tYW5k Lmg6CisgICAgICAgICogZWRpdGluZy9Nb2RpZnlTZWxlY3Rpb25MaXN0TGV2ZWwuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Z2V0U3RhcnRFbmRMaXN0Q2hpbGRyZW4pOiBDYWxsIGFuY2hvck5vZGUo KSBpbnN0ZWFkIG9mIGRlcHJlY2F0ZWROb2RlKCkgYmVjYXVzZSB0aGUgc3RhcnQKKyAgICAgICAg b3IgdGhlIGVuZCBvZiBzZWxlY3Rpb24gY291bGQgYmUgYW4gaW1tZWRpYXRlIGNoaWxkIG9mIGEg bGlzdCBub2RlIChlLmcuIGJyIGluc2lkZSB1bCkKKwogMjAxMS0wMi0yNyAgQmVuamFtaW4gUG91 bGFpbiAgPGJlbmphbWluLnBvdWxhaW5Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IFNhbSBXZWluaWcuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0NvbXBvc2l0ZUVkaXRD b21tYW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0NvbXBvc2l0 ZUVkaXRDb21tYW5kLmNwcAkocmV2aXNpb24gNzk4NDApCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQyLDE4ICsz NDIsMjMgQEAgdm9pZCBDb21wb3NpdGVFZGl0Q29tbWFuZDo6cmVwbGFjZVRleHRJbgogCiBQb3Np dGlvbiBDb21wb3NpdGVFZGl0Q29tbWFuZDo6cG9zaXRpb25PdXRzaWRlVGFiU3Bhbihjb25zdCBQ b3NpdGlvbiYgcG9zKQogewotICAgIGlmICghaXNUYWJTcGFuVGV4dE5vZGUocG9zLmRlcHJlY2F0 ZWROb2RlKCkpKQorICAgIGlmICghaXNUYWJTcGFuVGV4dE5vZGUocG9zLmFuY2hvck5vZGUoKSkp CiAgICAgICAgIHJldHVybiBwb3M7Ci0gICAgCi0gICAgTm9kZSogdGFiU3BhbiA9IHRhYlNwYW5O b2RlKHBvcy5kZXByZWNhdGVkTm9kZSgpKTsKLSAgICAKLSAgICBpZiAocG9zLmRlcHJlY2F0ZWRF ZGl0aW5nT2Zmc2V0KCkgPD0gY2FyZXRNaW5PZmZzZXQocG9zLmRlcHJlY2F0ZWROb2RlKCkpKQor CisgICAgaWYgKHBvcy5hbmNob3JUeXBlKCkgPT0gUG9zaXRpb246OlBvc2l0aW9uSXNBZnRlckFu Y2hvcikKKyAgICAgICAgcmV0dXJuIHBvc2l0aW9uSW5QYXJlbnRBZnRlck5vZGUocG9zLmFuY2hv ck5vZGUoKSk7CisgICAgaWYgKHBvcy5hbmNob3JUeXBlKCkgPT0gUG9zaXRpb246OlBvc2l0aW9u SXNCZWZvcmVBbmNob3IpCisgICAgICAgIHJldHVybiBwb3NpdGlvbkluUGFyZW50QmVmb3JlTm9k ZShwb3MuYW5jaG9yTm9kZSgpKTsKKworICAgIE5vZGUqIHRhYlNwYW4gPSB0YWJTcGFuTm9kZShw b3MuY29udGFpbmVyTm9kZSgpKTsKKworICAgIGlmIChwb3Mub2Zmc2V0SW5Db250YWluZXJOb2Rl KCkgPD0gY2FyZXRNaW5PZmZzZXQocG9zLmNvbnRhaW5lck5vZGUoKSkpCiAgICAgICAgIHJldHVy biBwb3NpdGlvbkluUGFyZW50QmVmb3JlTm9kZSh0YWJTcGFuKTsKLSAgICAgICAgCi0gICAgaWYg KHBvcy5kZXByZWNhdGVkRWRpdGluZ09mZnNldCgpID49IGNhcmV0TWF4T2Zmc2V0KHBvcy5kZXBy ZWNhdGVkTm9kZSgpKSkKKworICAgIGlmIChwb3Mub2Zmc2V0SW5Db250YWluZXJOb2RlKCkgPj0g Y2FyZXRNYXhPZmZzZXQocG9zLmNvbnRhaW5lck5vZGUoKSkpCiAgICAgICAgIHJldHVybiBwb3Np dGlvbkluUGFyZW50QWZ0ZXJOb2RlKHRhYlNwYW4pOwogCi0gICAgc3BsaXRUZXh0Tm9kZUNvbnRh aW5pbmdFbGVtZW50KHN0YXRpY19jYXN0PFRleHQgKj4ocG9zLmRlcHJlY2F0ZWROb2RlKCkpLCBw b3MuZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQoKSk7CisgICAgc3BsaXRUZXh0Tm9kZUNvbnRhaW5p bmdFbGVtZW50KHN0YXRpY19jYXN0PFRleHQgKj4ocG9zLmNvbnRhaW5lck5vZGUoKSksIHBvcy5v ZmZzZXRJbkNvbnRhaW5lck5vZGUoKSk7CiAgICAgcmV0dXJuIHBvc2l0aW9uSW5QYXJlbnRCZWZv cmVOb2RlKHRhYlNwYW4pOwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0luc2Vy dFRleHRDb21tYW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0lu c2VydFRleHRDb21tYW5kLmNwcAkocmV2aXNpb24gNzk4NDApCisrKyBTb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL0luc2VydFRleHRDb21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTMsMjAgKzUz LDIwIEBAIHZvaWQgSW5zZXJ0VGV4dENvbW1hbmQ6OmRvQXBwbHkoKQogewogfQogCi1Qb3NpdGlv biBJbnNlcnRUZXh0Q29tbWFuZDo6cHJlcGFyZUZvclRleHRJbnNlcnRpb24oY29uc3QgUG9zaXRp b24mIHApCitQb3NpdGlvbiBJbnNlcnRUZXh0Q29tbWFuZDo6cG9zaXRpb25JbnNpZGVUZXh0Tm9k ZShjb25zdCBQb3NpdGlvbiYgcCkKIHsKICAgICBQb3NpdGlvbiBwb3MgPSBwOwotICAgIC8vIFBy ZXBhcmUgZm9yIHRleHQgaW5wdXQgYnkgbG9va2luZyBhdCB0aGUgc3BlY2lmaWVkIHBvc2l0aW9u LgotICAgIC8vIEl0IG1heSBiZSBuZWNlc3NhcnkgdG8gaW5zZXJ0IGEgdGV4dCBub2RlIHRvIHJl Y2VpdmUgY2hhcmFjdGVycy4KLSAgICBpZiAoIXBvcy5kZXByZWNhdGVkTm9kZSgpLT5pc1RleHRO b2RlKCkpIHsKKyAgICBpZiAoaXNUYWJTcGFuVGV4dE5vZGUocG9zLmFuY2hvck5vZGUoKSkpIHsK ICAgICAgICAgUmVmUHRyPE5vZGU+IHRleHROb2RlID0gZG9jdW1lbnQoKS0+Y3JlYXRlRWRpdGlu Z1RleHROb2RlKCIiKTsKLSAgICAgICAgaW5zZXJ0Tm9kZUF0KHRleHROb2RlLmdldCgpLCBwb3Mp OworICAgICAgICBpbnNlcnROb2RlQXRUYWJTcGFuUG9zaXRpb24odGV4dE5vZGUuZ2V0KCksIHBv cyk7CiAgICAgICAgIHJldHVybiBmaXJzdFBvc2l0aW9uSW5Ob2RlKHRleHROb2RlLmdldCgpKTsK ICAgICB9CiAKLSAgICBpZiAoaXNUYWJTcGFuVGV4dE5vZGUocG9zLmRlcHJlY2F0ZWROb2RlKCkp KSB7CisgICAgLy8gUHJlcGFyZSBmb3IgdGV4dCBpbnB1dCBieSBsb29raW5nIGF0IHRoZSBzcGVj aWZpZWQgcG9zaXRpb24uCisgICAgLy8gSXQgbWF5IGJlIG5lY2Vzc2FyeSB0byBpbnNlcnQgYSB0 ZXh0IG5vZGUgdG8gcmVjZWl2ZSBjaGFyYWN0ZXJzLgorICAgIGlmICghcG9zLmNvbnRhaW5lck5v ZGUoKS0+aXNUZXh0Tm9kZSgpKSB7CiAgICAgICAgIFJlZlB0cjxOb2RlPiB0ZXh0Tm9kZSA9IGRv Y3VtZW50KCktPmNyZWF0ZUVkaXRpbmdUZXh0Tm9kZSgiIik7Ci0gICAgICAgIGluc2VydE5vZGVB dFRhYlNwYW5Qb3NpdGlvbih0ZXh0Tm9kZS5nZXQoKSwgcG9zKTsKKyAgICAgICAgaW5zZXJ0Tm9k ZUF0KHRleHROb2RlLmdldCgpLCBwb3MpOwogICAgICAgICByZXR1cm4gZmlyc3RQb3NpdGlvbklu Tm9kZSh0ZXh0Tm9kZS5nZXQoKSk7CiAgICAgfQogCkBAIC0xNDcsNyArMTQ3LDcgQEAgdm9pZCBJ bnNlcnRUZXh0Q29tbWFuZDo6aW5wdXQoY29uc3QgU3RyaQogICAgIAogICAgIC8vIEl0IGlzIHBv c3NpYmxlIGZvciB0aGUgbm9kZSB0aGF0IGNvbnRhaW5zIHN0YXJ0UG9zaXRpb24gdG8gY29udGFp biBvbmx5IHVucmVuZGVyZWQgd2hpdGVzcGFjZSwKICAgICAvLyBhbmQgc28gZGVsZXRlSW5zaWdu aWZpY2FudFRleHQgY291bGQgcmVtb3ZlIGl0LiAgU2F2ZSB0aGUgcG9zaXRpb24gYmVmb3JlIHRo ZSBub2RlIGluIGNhc2UgdGhhdCBoYXBwZW5zLgotICAgIFBvc2l0aW9uIHBvc2l0aW9uQmVmb3Jl U3RhcnROb2RlKHBvc2l0aW9uSW5QYXJlbnRCZWZvcmVOb2RlKHN0YXJ0UG9zaXRpb24uZGVwcmVj YXRlZE5vZGUoKSkpOworICAgIFBvc2l0aW9uIHBvc2l0aW9uQmVmb3JlU3RhcnROb2RlKHBvc2l0 aW9uSW5QYXJlbnRCZWZvcmVOb2RlKHN0YXJ0UG9zaXRpb24uY29udGFpbmVyTm9kZSgpKSk7CiAg ICAgZGVsZXRlSW5zaWduaWZpY2FudFRleHQoc3RhcnRQb3NpdGlvbi51cHN0cmVhbSgpLCBzdGFy dFBvc2l0aW9uLmRvd25zdHJlYW0oKSk7CiAgICAgaWYgKCFzdGFydFBvc2l0aW9uLmFuY2hvck5v ZGUoKS0+aW5Eb2N1bWVudCgpKQogICAgICAgICBzdGFydFBvc2l0aW9uID0gcG9zaXRpb25CZWZv cmVTdGFydE5vZGU7CkBAIC0xNjUsMTEgKzE2NSwxNCBAQCB2b2lkIEluc2VydFRleHRDb21tYW5k OjppbnB1dChjb25zdCBTdHJpCiAgICAgICAgICAgICByZW1vdmVQbGFjZWhvbGRlckF0KHBsYWNl aG9sZGVyKTsKICAgICB9IGVsc2UgewogICAgICAgICAvLyBNYWtlIHN1cmUgdGhlIGRvY3VtZW50 IGlzIHNldCB1cCB0byByZWNlaXZlIHRleHQKLSAgICAgICAgc3RhcnRQb3NpdGlvbiA9IHByZXBh cmVGb3JUZXh0SW5zZXJ0aW9uKHN0YXJ0UG9zaXRpb24pOworICAgICAgICBzdGFydFBvc2l0aW9u ID0gcG9zaXRpb25JbnNpZGVUZXh0Tm9kZShzdGFydFBvc2l0aW9uKTsKKyAgICAgICAgQVNTRVJU KHN0YXJ0UG9zaXRpb24uYW5jaG9yVHlwZSgpID09IFBvc2l0aW9uOjpQb3NpdGlvbklzT2Zmc2V0 SW5BbmNob3IpOworICAgICAgICBBU1NFUlQoc3RhcnRQb3NpdGlvbi5jb250YWluZXJOb2RlKCkp OworICAgICAgICBBU1NFUlQoc3RhcnRQb3NpdGlvbi5jb250YWluZXJOb2RlKCktPmlzVGV4dE5v ZGUoKSk7CiAgICAgICAgIGlmIChwbGFjZWhvbGRlci5pc05vdE51bGwoKSkKICAgICAgICAgICAg IHJlbW92ZVBsYWNlaG9sZGVyQXQocGxhY2Vob2xkZXIpOwotICAgICAgICBUZXh0KiB0ZXh0Tm9k ZSA9IHN0YXRpY19jYXN0PFRleHQqPihzdGFydFBvc2l0aW9uLmRlcHJlY2F0ZWROb2RlKCkpOwot ICAgICAgICBpbnQgb2Zmc2V0ID0gc3RhcnRQb3NpdGlvbi5kZXByZWNhdGVkRWRpdGluZ09mZnNl dCgpOworICAgICAgICBUZXh0KiB0ZXh0Tm9kZSA9IHN0YXRpY19jYXN0PFRleHQqPihzdGFydFBv c2l0aW9uLmNvbnRhaW5lck5vZGUoKSk7CisgICAgICAgIGNvbnN0IHVuc2lnbmVkIG9mZnNldCA9 IHN0YXJ0UG9zaXRpb24ub2Zmc2V0SW5Db250YWluZXJOb2RlKCk7CiAKICAgICAgICAgaW5zZXJ0 VGV4dEludG9Ob2RlKHRleHROb2RlLCBvZmZzZXQsIHRleHQpOwogICAgICAgICBlbmRQb3NpdGlv biA9IFBvc2l0aW9uKHRleHROb2RlLCBvZmZzZXQgKyB0ZXh0Lmxlbmd0aCgpLCBQb3NpdGlvbjo6 UG9zaXRpb25Jc09mZnNldEluQW5jaG9yKTsKQEAgLTE4Myw3ICsxODYsNyBAQCB2b2lkIEluc2Vy dFRleHRDb21tYW5kOjppbnB1dChjb25zdCBTdHJpCiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAg ICAgICBBU1NFUlQod2hpdGVzcGFjZVJlYmFsYW5jZSA9PSBSZWJhbGFuY2VBbGxXaGl0ZXNwYWNl cyk7CiAgICAgICAgICAgICBpZiAoY2FuUmViYWxhbmNlKHN0YXJ0UG9zaXRpb24pICYmIGNhblJl YmFsYW5jZShlbmRQb3NpdGlvbikpCi0gICAgICAgICAgICAgICAgcmViYWxhbmNlV2hpdGVzcGFj ZU9uVGV4dFN1YnN0cmluZyh0ZXh0Tm9kZSwgc3RhcnRQb3NpdGlvbi5kZXByZWNhdGVkRWRpdGlu Z09mZnNldCgpLCBlbmRQb3NpdGlvbi5kZXByZWNhdGVkRWRpdGluZ09mZnNldCgpKTsKKyAgICAg ICAgICAgICAgICByZWJhbGFuY2VXaGl0ZXNwYWNlT25UZXh0U3Vic3RyaW5nKHRleHROb2RlLCBz dGFydFBvc2l0aW9uLm9mZnNldEluQ29udGFpbmVyTm9kZSgpLCBlbmRQb3NpdGlvbi5vZmZzZXRJ bkNvbnRhaW5lck5vZGUoKSk7CiAgICAgICAgIH0KICAgICB9CiAKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2VkaXRpbmcvSW5zZXJ0VGV4dENvbW1hbmQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL0luc2VydFRleHRDb21tYW5kLmgJKHJldmlzaW9uIDc5ODQwKQorKysgU291 cmNlL1dlYkNvcmUvZWRpdGluZy9JbnNlcnRUZXh0Q29tbWFuZC5oCSh3b3JraW5nIGNvcHkpCkBA IC01Myw3ICs1Myw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRvQXBwbHkoKTsKICAg ICB2aXJ0dWFsIGJvb2wgaXNJbnNlcnRUZXh0Q29tbWFuZCgpIGNvbnN0OwogCi0gICAgUG9zaXRp b24gcHJlcGFyZUZvclRleHRJbnNlcnRpb24oY29uc3QgUG9zaXRpb24mKTsKKyAgICBQb3NpdGlv biBwb3NpdGlvbkluc2lkZVRleHROb2RlKGNvbnN0IFBvc2l0aW9uJik7CiAgICAgUG9zaXRpb24g aW5zZXJ0VGFiKGNvbnN0IFBvc2l0aW9uJik7CiAgICAgCiAgICAgYm9vbCBwZXJmb3JtVHJpdmlh bFJlcGxhY2UoY29uc3QgU3RyaW5nJiwgYm9vbCBzZWxlY3RJbnNlcnRlZFRleHQpOwpJbmRleDog U291cmNlL1dlYkNvcmUvZWRpdGluZy9Nb2RpZnlTZWxlY3Rpb25MaXN0TGV2ZWwuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvTW9kaWZ5U2VsZWN0aW9uTGlzdExldmVs LmNwcAkocmV2aXNpb24gNzk4NDApCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL01vZGlmeVNl bGVjdGlvbkxpc3RMZXZlbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUyLDEyICs1MiwxMiBAQCBz dGF0aWMgYm9vbCBnZXRTdGFydEVuZExpc3RDaGlsZHJlbihjb25zCiAgICAgICAgIHJldHVybiBm YWxzZTsKIAogICAgIC8vIHN0YXJ0IG11c3QgYmUgaW4gYSBsaXN0IGNoaWxkCi0gICAgTm9kZSog c3RhcnRMaXN0Q2hpbGQgPSBlbmNsb3NpbmdMaXN0Q2hpbGQoc2VsZWN0aW9uLnN0YXJ0KCkuZGVw cmVjYXRlZE5vZGUoKSk7CisgICAgTm9kZSogc3RhcnRMaXN0Q2hpbGQgPSBlbmNsb3NpbmdMaXN0 Q2hpbGQoc2VsZWN0aW9uLnN0YXJ0KCkuYW5jaG9yTm9kZSgpKTsKICAgICBpZiAoIXN0YXJ0TGlz dENoaWxkKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIAorCiAgICAgLy8gZW5kIG11 c3QgYmUgaW4gYSBsaXN0IGNoaWxkCi0gICAgTm9kZSogZW5kTGlzdENoaWxkID0gc2VsZWN0aW9u LmlzUmFuZ2UoKSA/IGVuY2xvc2luZ0xpc3RDaGlsZChzZWxlY3Rpb24uZW5kKCkuZGVwcmVjYXRl ZE5vZGUoKSkgOiBzdGFydExpc3RDaGlsZDsKKyAgICBOb2RlKiBlbmRMaXN0Q2hpbGQgPSBzZWxl Y3Rpb24uaXNSYW5nZSgpID8gZW5jbG9zaW5nTGlzdENoaWxkKHNlbGVjdGlvbi5lbmQoKS5hbmNo b3JOb2RlKCkpIDogc3RhcnRMaXN0Q2hpbGQ7CiAgICAgaWYgKCFlbmRMaXN0Q2hpbGQpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKICAgICAK