55354 2011-02-28 00:05:52 -0800 Assert that 0 <= offset <= lastOffsetInNode in Position's constructor, moveToPosition, and moveToOffset 2011-03-03 00:11:08 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All All NEW P2 Enhancement --- 51389 52098 1 rniwa webkit-unassigned darin enrica eric justin.garcia kalman leviw oldest_to_newest 358912 0 rniwa 2011-02-28 00:05:52 -0800 Right now, we have both legacy editing positions and new positions. To make sure new types of positions aren't using legacy offsets (below 0 or above the maximum offset), we should assert the offset is between 0 and the last offset in the container node in Position::Position, Position::moveToOffset, and Position::moveToPosition. 358913 1 84023 rniwa 2011-02-28 00:07:32 -0800 Created attachment 84023 work in progress 361400 2 rniwa 2011-03-03 00:07:59 -0800 Now that the bug 51389 has been fixed, the only thing that prevents me from posting a patch for this bug is TypingCommand::forwardDeleteKeyPressed: if (!startingSelection().isRange() || selectionToDelete.base() != startingSelection().start()) selectionAfterUndo = selectionToDelete; else { // It's a little tricky to compute what the starting selection would have been in the original document. // We can't let the VisibleSelection class's validation kick in or it'll adjust for us based on // the current state of the document and we'll get the wrong result. Position extent = startingSelection().end(); if (extent.deprecatedNode() != selectionToDelete.end().deprecatedNode()) extent = selectionToDelete.extent(); else { int extraCharacters; if (selectionToDelete.start().deprecatedNode() == selectionToDelete.end().deprecatedNode()) extraCharacters = selectionToDelete.end().deprecatedEditingOffset() - selectionToDelete.start().deprecatedEditingOffset(); else extraCharacters = selectionToDelete.end().deprecatedEditingOffset(); @ extent = Position(extent.deprecatedNode(), extent.deprecatedEditingOffset() + extraCharacters, Position::PositionIsOffsetInAnchor); } selectionAfterUndo.setWithoutValidation(startingSelection().start(), extent); } In running editing/undo/undo-forward-delete-boundary.html, we forward delete each letter in "wo<b>rd</b> and undo it. When we forward delete the first letter, we get the following values at @: (gdb) p startingSelection().showTreeForThis() BODY 0x129859dc0 #text 0x1298617c0 "\n" DIV 0x129862a60 CLASS=editing #text 0x1298604e0 "\n" SPAN 0x129860540 SE #text 0x129848440 "This o" B 0x12985d950 #text 0x129868c60 "rd " #text 0x12985bae0 "should be selected, since the test deleted it a character at a time and then did an undo." #text 0x12985bbc0 "\n" #text 0x129858560 "\n\n" SCRIPT 0x1298585c0 #text 0x1298586e0 "\nrunEditingTest();\n" start: legacy, offset, offset:5 end: legacy, offset, offset:6 $1 = void Current language: auto; currently c++ (gdb) p selectionToDelete.showTreeForThis() BODY 0x129859dc0 #text 0x1298617c0 "\n" DIV 0x129862a60 CLASS=editing #text 0x1298604e0 "\n" SPAN 0x129860540 SE #text 0x129848440 "This o" B 0x12985d950 #text 0x129868c60 "rd " #text 0x12985bae0 "should be selected, since the test deleted it a character at a time and then did an undo." #text 0x12985bbc0 "\n" #text 0x129858560 "\n\n" SCRIPT 0x1298585c0 #text 0x1298586e0 "\nrunEditingTest();\n" start: legacy, offset, offset:5 end: legacy, offset, offset:6 $2 = void And we end up creating a position with offset 7 to incorporate "w" that has already been deleted. In various parts of editing code, we do need to store such "invalid" positions for undo/redo operations. Maybe that we need a variant of Position (PositionForUndo or UndoablePosition?) that tolerates such positions. 361402 3 84529 rniwa 2011-03-03 00:11:08 -0800 Created attachment 84529 work in progress 2 84023 2011-02-28 00:07:32 -0800 2011-03-03 00:11:08 -0800 work in progress wip55354 text/plain 5317 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9DaGFyYWN0ZXJEYXRhLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9kb20vQ2hhcmFjdGVyRGF0YS5jcHAJKHJldmlzaW9uIDc5ODQwKQor KysgU291cmNlL1dlYkNvcmUvZG9tL0NoYXJhY3RlckRhdGEuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xNTAsMTEgKzE1MCwxMSBAQCB2b2lkIENoYXJhY3RlckRhdGE6OnNldE5vZGVWYWx1ZShjb25z dCBTCiAKIHZvaWQgQ2hhcmFjdGVyRGF0YTo6c2V0RGF0YUFuZFVwZGF0ZShQYXNzUmVmUHRyPFN0 cmluZ0ltcGw+IG5ld0RhdGEsIHVuc2lnbmVkIG9mZnNldE9mUmVwbGFjZWREYXRhLCB1bnNpZ25l ZCBvbGRMZW5ndGgsIHVuc2lnbmVkIG5ld0xlbmd0aCkKIHsKLSAgICBpZiAoZG9jdW1lbnQoKS0+ ZnJhbWUoKSkKLSAgICAgICAgZG9jdW1lbnQoKS0+ZnJhbWUoKS0+c2VsZWN0aW9uKCktPnRleHRX aWxsQmVSZXBsYWNlZCh0aGlzLCBvZmZzZXRPZlJlcGxhY2VkRGF0YSwgb2xkTGVuZ3RoLCBuZXdM ZW5ndGgpOwogICAgIFJlZlB0cjxTdHJpbmdJbXBsPiBvbGREYXRhID0gbV9kYXRhOwogICAgIG1f ZGF0YSA9IG5ld0RhdGE7CiAgICAgdXBkYXRlUmVuZGVyZXIob2Zmc2V0T2ZSZXBsYWNlZERhdGEs IG9sZExlbmd0aCk7CisgICAgaWYgKGRvY3VtZW50KCktPmZyYW1lKCkpCisgICAgICAgIGRvY3Vt ZW50KCktPmZyYW1lKCktPnNlbGVjdGlvbigpLT50ZXh0V2lsbEJlUmVwbGFjZWQodGhpcywgb2Zm c2V0T2ZSZXBsYWNlZERhdGEsIG9sZExlbmd0aCwgbmV3TGVuZ3RoKTsKICAgICBkaXNwYXRjaE1v ZGlmaWVkRXZlbnQob2xkRGF0YS5nZXQoKSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Rv bS9Qb3NpdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL1Bvc2l0aW9u LmNwcAkocmV2aXNpb24gNzk4NDApCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24uY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC05NCwyMCArOTQsMjcgQEAgUG9zaXRpb246OlBvc2l0aW9uKFBh c3NSZWZQdHI8Tm9kZT4gYW5jaAogICAgICwgbV9hbmNob3JUeXBlKGFuY2hvclR5cGUpCiAgICAg LCBtX2lzTGVnYWN5RWRpdGluZ1Bvc2l0aW9uKGZhbHNlKQogeworICAgIEFTU0VSVChtX29mZnNl dCA+PSAwKTsKKyAgICBBU1NFUlQoIW1fYW5jaG9yTm9kZSB8fCBtX29mZnNldCA8PSBsYXN0T2Zm c2V0SW5Ob2RlKG1fYW5jaG9yTm9kZS5nZXQoKSkpOwogICAgIEFTU0VSVChhbmNob3JUeXBlID09 IFBvc2l0aW9uSXNPZmZzZXRJbkFuY2hvcik7CiB9CiAKIHZvaWQgUG9zaXRpb246Om1vdmVUb1Bv c2l0aW9uKFBhc3NSZWZQdHI8Tm9kZT4gbm9kZSwgaW50IG9mZnNldCkKIHsKICAgICBBU1NFUlQo YW5jaG9yVHlwZSgpID09IFBvc2l0aW9uSXNPZmZzZXRJbkFuY2hvciB8fCBtX2lzTGVnYWN5RWRp dGluZ1Bvc2l0aW9uKTsKKyAgICBBU1NFUlQobV9pc0xlZ2FjeUVkaXRpbmdQb3NpdGlvbiB8fCBv ZmZzZXQgPj0gMCk7CisgICAgQVNTRVJUKG1faXNMZWdhY3lFZGl0aW5nUG9zaXRpb24gfHwgIW5v ZGUgfHwgb2Zmc2V0IDw9IGxhc3RPZmZzZXRJbk5vZGUobm9kZS5nZXQoKSkpOwogICAgIG1fYW5j aG9yTm9kZSA9IG5vZGU7CiAgICAgbV9vZmZzZXQgPSBvZmZzZXQ7CiAgICAgaWYgKG1faXNMZWdh Y3lFZGl0aW5nUG9zaXRpb24pCiAgICAgICAgIG1fYW5jaG9yVHlwZSA9IGFuY2hvclR5cGVGb3JM ZWdhY3lFZGl0aW5nUG9zaXRpb24obV9hbmNob3JOb2RlLmdldCgpLCBtX29mZnNldCk7CiB9CisK IHZvaWQgUG9zaXRpb246Om1vdmVUb09mZnNldChpbnQgb2Zmc2V0KQogewogICAgIEFTU0VSVChh bmNob3JUeXBlKCkgPT0gUG9zaXRpb25Jc09mZnNldEluQW5jaG9yIHx8IG1faXNMZWdhY3lFZGl0 aW5nUG9zaXRpb24pOworICAgIEFTU0VSVChtX2lzTGVnYWN5RWRpdGluZ1Bvc2l0aW9uIHx8IG9m ZnNldCA+PSAwKTsKKyAgICBBU1NFUlQobV9pc0xlZ2FjeUVkaXRpbmdQb3NpdGlvbiB8fCAhbV9h bmNob3JOb2RlIHx8IG9mZnNldCA8PSBsYXN0T2Zmc2V0SW5Ob2RlKG1fYW5jaG9yTm9kZS5nZXQo KSkpOwogICAgIG1fb2Zmc2V0ID0gb2Zmc2V0OwogICAgIGlmIChtX2lzTGVnYWN5RWRpdGluZ1Bv c2l0aW9uKQogICAgICAgICBtX2FuY2hvclR5cGUgPSBhbmNob3JUeXBlRm9yTGVnYWN5RWRpdGlu Z1Bvc2l0aW9uKG1fYW5jaG9yTm9kZS5nZXQoKSwgbV9vZmZzZXQpOwpJbmRleDogU291cmNlL1dl YkNvcmUvZWRpdGluZy9TZWxlY3Rpb25Db250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL1NlbGVjdGlvbkNvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiA3OTg0 MCkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvU2VsZWN0aW9uQ29udHJvbGxlci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTI4Myw3ICsyODMsNyBAQCBzdGF0aWMgYm9vbCBzaG91bGRSZW1vdmVQ b3NpdGlvbkFmdGVyQWRvCiAgICAgaWYgKHN0YXRpY19jYXN0PHVuc2lnbmVkPihwb3NpdGlvbi5v ZmZzZXRJbkNvbnRhaW5lck5vZGUoKSkgPiBvZmZzZXQgJiYgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+ KHBvc2l0aW9uLm9mZnNldEluQ29udGFpbmVyTm9kZSgpKSA8IG9mZnNldCArIG9sZExlbmd0aCkK ICAgICAgICAgcmV0dXJuIHRydWU7CiAKLSAgICBpZiAoKHR5cGUgPT0gRW5kUG9pbnRJc1N0YXJ0 ICYmIHN0YXRpY19jYXN0PHVuc2lnbmVkPihwb3NpdGlvbi5vZmZzZXRJbkNvbnRhaW5lck5vZGUo KSkgPj0gb2Zmc2V0ICsgb2xkTGVuZ3RoKQorICAgIGlmICgoKHR5cGUgPT0gRW5kUG9pbnRJc1N0 YXJ0IHx8IG9sZExlbmd0aCkgJiYgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHBvc2l0aW9uLm9mZnNl dEluQ29udGFpbmVyTm9kZSgpKSA+PSBvZmZzZXQgKyBvbGRMZW5ndGgpCiAgICAgICAgIHx8ICh0 eXBlID09IEVuZFBvaW50SXNFbmQgJiYgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHBvc2l0aW9uLm9m ZnNldEluQ29udGFpbmVyTm9kZSgpKSA+IG9mZnNldCArIG9sZExlbmd0aCkpCiAgICAgICAgIHBv c2l0aW9uLm1vdmVUb09mZnNldChwb3NpdGlvbi5vZmZzZXRJbkNvbnRhaW5lck5vZGUoKSAtIG9s ZExlbmd0aCArIG5ld0xlbmd0aCk7CiAKQEAgLTMxMSw5ICszMTEsOSBAQCB2b2lkIFNlbGVjdGlv bkNvbnRyb2xsZXI6OnRleHRXaWxsQmVSZXBsCiAgICAgICAgICAgICBtX3NlbGVjdGlvbi5zZXRX aXRob3V0VmFsaWRhdGlvbihiYXNlLCBleHRlbnQpOwogICAgICAgICBlbHNlIHsKICAgICAgICAg ICAgIGlmIChtX3NlbGVjdGlvbi5pc0Jhc2VGaXJzdCgpKQotICAgICAgICAgICAgICAgIG1fc2Vs ZWN0aW9uLnNldFdpdGhvdXRWYWxpZGF0aW9uKG1fc2VsZWN0aW9uLnN0YXJ0KCksIG1fc2VsZWN0 aW9uLmVuZCgpKTsKKyAgICAgICAgICAgICAgICBtX3NlbGVjdGlvbi5zZXRXaXRob3V0VmFsaWRh dGlvbihzdGFydCwgZW5kKTsKICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBtX3Nl bGVjdGlvbi5zZXRXaXRob3V0VmFsaWRhdGlvbihtX3NlbGVjdGlvbi5lbmQoKSwgbV9zZWxlY3Rp b24uc3RhcnQoKSk7CisgICAgICAgICAgICAgICAgbV9zZWxlY3Rpb24uc2V0V2l0aG91dFZhbGlk YXRpb24oZW5kLCBzdGFydCk7CiAgICAgICAgIH0KICAgICB9CiAKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2VkaXRpbmcvVHlwaW5nQ29tbWFuZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvZWRpdGluZy9UeXBpbmdDb21tYW5kLmNwcAkocmV2aXNpb24gNzk4NDApCisrKyBTb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL1R5cGluZ0NvbW1hbmQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OTEs MTIgKzU5MSwxMiBAQCB2b2lkIFR5cGluZ0NvbW1hbmQ6OmZvcndhcmREZWxldGVLZXlQcmVzCiAg ICAgICAgICAgICBpZiAoZXh0ZW50LmRlcHJlY2F0ZWROb2RlKCkgIT0gc2VsZWN0aW9uVG9EZWxl dGUuZW5kKCkuZGVwcmVjYXRlZE5vZGUoKSkKICAgICAgICAgICAgICAgICBleHRlbnQgPSBzZWxl Y3Rpb25Ub0RlbGV0ZS5leHRlbnQoKTsKICAgICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAg ICAgIGludCBleHRyYUNoYXJhY3RlcnM7CisgICAgICAgICAgICAgICAgaW50IG9mZnNldEFmdGVy VW5kbzsKICAgICAgICAgICAgICAgICBpZiAoc2VsZWN0aW9uVG9EZWxldGUuc3RhcnQoKS5kZXBy ZWNhdGVkTm9kZSgpID09IHNlbGVjdGlvblRvRGVsZXRlLmVuZCgpLmRlcHJlY2F0ZWROb2RlKCkp Ci0gICAgICAgICAgICAgICAgICAgIGV4dHJhQ2hhcmFjdGVycyA9IHNlbGVjdGlvblRvRGVsZXRl LmVuZCgpLmRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0KCkgLSBzZWxlY3Rpb25Ub0RlbGV0ZS5zdGFy dCgpLmRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0KCk7CisgICAgICAgICAgICAgICAgICAgIG9mZnNl dEFmdGVyVW5kbyA9IHNlbGVjdGlvblRvRGVsZXRlLmVuZCgpLmRlcHJlY2F0ZWRFZGl0aW5nT2Zm c2V0KCkgLSBzZWxlY3Rpb25Ub0RlbGV0ZS5zdGFydCgpLmRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0 KCk7CiAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICBleHRyYUNoYXJh Y3RlcnMgPSBzZWxlY3Rpb25Ub0RlbGV0ZS5lbmQoKS5kZXByZWNhdGVkRWRpdGluZ09mZnNldCgp OwotICAgICAgICAgICAgICAgIGV4dGVudCA9IFBvc2l0aW9uKGV4dGVudC5kZXByZWNhdGVkTm9k ZSgpLCBleHRlbnQuZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQoKSArIGV4dHJhQ2hhcmFjdGVycywg UG9zaXRpb246OlBvc2l0aW9uSXNPZmZzZXRJbkFuY2hvcik7CisgICAgICAgICAgICAgICAgICAg IG9mZnNldEFmdGVyVW5kbyA9IHNlbGVjdGlvblRvRGVsZXRlLmVuZCgpLmRlcHJlY2F0ZWRFZGl0 aW5nT2Zmc2V0KCk7CisgICAgICAgICAgICAgICAgZXh0ZW50ID0gUG9zaXRpb24oZXh0ZW50LmRl cHJlY2F0ZWROb2RlKCksIG9mZnNldEFmdGVyVW5kbywgUG9zaXRpb246OlBvc2l0aW9uSXNPZmZz ZXRJbkFuY2hvcik7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBzZWxlY3Rpb25BZnRlclVu ZG8uc2V0V2l0aG91dFZhbGlkYXRpb24oc3RhcnRpbmdTZWxlY3Rpb24oKS5zdGFydCgpLCBleHRl bnQpOwogICAgICAgICB9Cg== 84529 2011-03-03 00:11:08 -0800 2011-03-03 00:11:08 -0800 work in progress 2 wip55354b text/plain 2496 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9DaGFyYWN0ZXJEYXRhLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9kb20vQ2hhcmFjdGVyRGF0YS5jcHAJKHJldmlzaW9uIDgwMjEwKQor KysgU291cmNlL1dlYkNvcmUvZG9tL0NoYXJhY3RlckRhdGEuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xNTAsMTEgKzE1MCwxMSBAQCB2b2lkIENoYXJhY3RlckRhdGE6OnNldE5vZGVWYWx1ZShjb25z dCBTCiAKIHZvaWQgQ2hhcmFjdGVyRGF0YTo6c2V0RGF0YUFuZFVwZGF0ZShQYXNzUmVmUHRyPFN0 cmluZ0ltcGw+IG5ld0RhdGEsIHVuc2lnbmVkIG9mZnNldE9mUmVwbGFjZWREYXRhLCB1bnNpZ25l ZCBvbGRMZW5ndGgsIHVuc2lnbmVkIG5ld0xlbmd0aCkKIHsKLSAgICBpZiAoZG9jdW1lbnQoKS0+ ZnJhbWUoKSkKLSAgICAgICAgZG9jdW1lbnQoKS0+ZnJhbWUoKS0+c2VsZWN0aW9uKCktPnRleHRX aWxsQmVSZXBsYWNlZCh0aGlzLCBvZmZzZXRPZlJlcGxhY2VkRGF0YSwgb2xkTGVuZ3RoLCBuZXdM ZW5ndGgpOwogICAgIFJlZlB0cjxTdHJpbmdJbXBsPiBvbGREYXRhID0gbV9kYXRhOwogICAgIG1f ZGF0YSA9IG5ld0RhdGE7CiAgICAgdXBkYXRlUmVuZGVyZXIob2Zmc2V0T2ZSZXBsYWNlZERhdGEs IG9sZExlbmd0aCk7CisgICAgaWYgKGRvY3VtZW50KCktPmZyYW1lKCkpCisgICAgICAgIGRvY3Vt ZW50KCktPmZyYW1lKCktPnNlbGVjdGlvbigpLT50ZXh0V2lsbEJlUmVwbGFjZWQodGhpcywgb2Zm c2V0T2ZSZXBsYWNlZERhdGEsIG9sZExlbmd0aCwgbmV3TGVuZ3RoKTsKICAgICBkaXNwYXRjaE1v ZGlmaWVkRXZlbnQob2xkRGF0YS5nZXQoKSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Rv bS9Qb3NpdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL1Bvc2l0aW9u LmNwcAkocmV2aXNpb24gODAyMTApCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24uY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC03MSw2ICs3MSwxNSBAQCBzdGF0aWMgTm9kZSogcHJldmlvdXNS ZW5kZXJlZEVkaXRhYmxlKE5vCiAgICAgcmV0dXJuIDA7CiB9CiAKKyNpZm5kZWYgTkRFQlVHCitz dGF0aWMgYm9vbCBvZmZzZXRJc0luVmFsaWRSYW5nZShOb2RlKiBub2RlLCBpbnQgb2Zmc2V0KQor eworICAgIGlmICghbm9kZSkKKyAgICAgICAgcmV0dXJuICFvZmZzZXQ7CisgICAgcmV0dXJuIG9m ZnNldCA+PSAwICYmIG9mZnNldCA8PSBsYXN0T2Zmc2V0SW5Ob2RlKG5vZGUpOworfQorI2VuZGlm CisKIFBvc2l0aW9uOjpQb3NpdGlvbihQYXNzUmVmUHRyPE5vZGU+IGFuY2hvck5vZGUsIGludCBv ZmZzZXQpCiAgICAgOiBtX2FuY2hvck5vZGUoYW5jaG9yTm9kZSkKICAgICAsIG1fb2Zmc2V0KG9m ZnNldCkKQEAgLTk1LDE5ICsxMDQsMjMgQEAgUG9zaXRpb246OlBvc2l0aW9uKFBhc3NSZWZQdHI8 Tm9kZT4gYW5jaAogICAgICwgbV9pc0xlZ2FjeUVkaXRpbmdQb3NpdGlvbihmYWxzZSkKIHsKICAg ICBBU1NFUlQoYW5jaG9yVHlwZSA9PSBQb3NpdGlvbklzT2Zmc2V0SW5BbmNob3IpOworICAgIEFT U0VSVChvZmZzZXRJc0luVmFsaWRSYW5nZShtX2FuY2hvck5vZGUuZ2V0KCksIG9mZnNldCkpOwog fQogCiB2b2lkIFBvc2l0aW9uOjptb3ZlVG9Qb3NpdGlvbihQYXNzUmVmUHRyPE5vZGU+IG5vZGUs IGludCBvZmZzZXQpCiB7CiAgICAgQVNTRVJUKGFuY2hvclR5cGUoKSA9PSBQb3NpdGlvbklzT2Zm c2V0SW5BbmNob3IgfHwgbV9pc0xlZ2FjeUVkaXRpbmdQb3NpdGlvbik7CisgICAgQVNTRVJUKG1f aXNMZWdhY3lFZGl0aW5nUG9zaXRpb24gfHwgb2Zmc2V0SXNJblZhbGlkUmFuZ2Uobm9kZS5nZXQo KSwgb2Zmc2V0KSk7CiAgICAgbV9hbmNob3JOb2RlID0gbm9kZTsKICAgICBtX29mZnNldCA9IG9m ZnNldDsKICAgICBpZiAobV9pc0xlZ2FjeUVkaXRpbmdQb3NpdGlvbikKICAgICAgICAgbV9hbmNo b3JUeXBlID0gYW5jaG9yVHlwZUZvckxlZ2FjeUVkaXRpbmdQb3NpdGlvbihtX2FuY2hvck5vZGUu Z2V0KCksIG1fb2Zmc2V0KTsKIH0KKwogdm9pZCBQb3NpdGlvbjo6bW92ZVRvT2Zmc2V0KGludCBv ZmZzZXQpCiB7CiAgICAgQVNTRVJUKGFuY2hvclR5cGUoKSA9PSBQb3NpdGlvbklzT2Zmc2V0SW5B bmNob3IgfHwgbV9pc0xlZ2FjeUVkaXRpbmdQb3NpdGlvbik7CisgICAgQVNTRVJUKG1faXNMZWdh Y3lFZGl0aW5nUG9zaXRpb24gfHwgb2Zmc2V0SXNJblZhbGlkUmFuZ2UoYW5jaG9yTm9kZSgpLCBv ZmZzZXQpKTsKICAgICBtX29mZnNldCA9IG9mZnNldDsKICAgICBpZiAobV9pc0xlZ2FjeUVkaXRp bmdQb3NpdGlvbikKICAgICAgICAgbV9hbmNob3JUeXBlID0gYW5jaG9yVHlwZUZvckxlZ2FjeUVk aXRpbmdQb3NpdGlvbihtX2FuY2hvck5vZGUuZ2V0KCksIG1fb2Zmc2V0KTsK