57616 2011-04-01 05:08:00 -0700 Web Inspector: Breakpoints in the gutter stay static while editing the text 2011-04-04 02:15:15 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 aandrey webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr podivilov rik timothy yurys oldest_to_newest 377720 0 aandrey 2011-04-01 05:08:00 -0700 We should adjust breakpoints while editing the text, as well as restore the breakpoints upon cancelling the live edit. 377723 1 87844 aandrey 2011-04-01 05:21:44 -0700 Created attachment 87844 Patch 377747 2 podivilov 2011-04-01 06:16:04 -0700 (In reply to comment #1) > Created an attachment (id=87844) [details] > Patch Looks good. Are there any plans to adjust breakpoints positions in the model as well? 378710 3 87844 podivilov 2011-04-04 02:15:04 -0700 Comment on attachment 87844 Patch Clearing flags on attachment: 87844 Committed r82808: <http://trac.webkit.org/changeset/82808> 378711 4 podivilov 2011-04-04 02:15:15 -0700 All reviewed patches have been landed. Closing bug. 87844 2011-04-01 05:21:44 -0700 2011-04-04 02:15:03 -0700 Patch bug-57616-20110401162142.patch text/plain 8758 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogODI2NzEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2ZTcxM2VjYTM4NjZjZGY0 ZWEyNTFlYjRkZmU0OTQ3NzQ4ODY1NjY4Li5lNjJhNjgxOTk3NTYwYmE4NmEzNDFjNzRlMDZiNWI1 OTc3ZWI1MzhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMDQtMDEgIEFuZHJl eSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEJyZWFrcG9pbnRzIGluIHRo ZSBndXR0ZXIgc3RheSBzdGF0aWMgd2hpbGUgZWRpdGluZyB0aGUgdGV4dAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc2MTYKKworICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U291cmNlRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlw ZS5fc2F2ZVZpZXdlclN0YXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5w cm90b3R5cGUuX3Jlc3RvcmVWaWV3ZXJTdGF0ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWUucHJvdG90eXBlLl9lbmRFZGl0aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T b3VyY2VGcmFtZS5wcm90b3R5cGUuX2xpbmVOdW1iZXJBZnRlckVkaXRpbmcpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5hZGRCcmVha3BvaW50KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUucmVtb3ZlQnJlYWtwb2ludCk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIucHJvdG90eXBlLl9zeW5jRGVjb3JhdGlvbnNGb3JMaW5l KToKKyAgICAgICAgKFdlYkluc3BlY3Rvcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVk aXRvckNodW5rZWRQYW5lbC5wcm90b3R5cGUucmVtb3ZlRGVjb3JhdGlvbik6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVGV4dEVkaXRvckNodW5rZWRQYW5lbC5wcm90b3R5cGUubWFrZUxpbmVBQ2h1 bmspOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwucHJvdG90 eXBlLl9zcGxpdENodW5rT25BTGluZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRv ck1haW5QYW5lbC5wcm90b3R5cGUuX3NwbGl0Q2h1bmtPbkFMaW5lKToKKwogMjAxMS0wMy0zMCAg UGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU291cmNlRnJhbWUuanMKaW5kZXggM2Y5M2M4MWFlNTFlZWVlZWQyNzBkNGQ1ZDVh M2E0M2U1ZTViY2QzYS4uNGU4ZDg4ODJkNjQwODUzNjVhOWU1MjIzZGFiZWI1YmU1ZjE0ZDk1OCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFt ZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1l LmpzCkBAIC00Nyw2ICs0Nyw4IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZSA9IGZ1bmN0aW9u KGRlbGVnYXRlLCB1cmwpCiAgICAgdGhpcy5fcm93TWVzc2FnZXMgPSB7fTsKICAgICB0aGlzLl9t ZXNzYWdlQnViYmxlcyA9IHt9OwogCisgICAgdGhpcy5fYnJlYWtwb2ludHMgPSB7fTsKKwogICAg IHRoaXMuX3JlZ2lzdGVyU2hvcnRjdXRzKCk7CiAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlz dGVuZXIoImtleWRvd24iLCB0aGlzLl9oYW5kbGVLZXlEb3duLmJpbmQodGhpcyksIGZhbHNlKTsK IH0KQEAgLTE3Nyw3ICsxNzksOCBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBl ID0gewogICAgICAgICAgICAgdGV4dE1vZGVsQ29udGVudDogdGhpcy5fdGV4dE1vZGVsLnRleHQs CiAgICAgICAgICAgICBleGVjdXRpb25MaW5lTnVtYmVyOiB0aGlzLl9leGVjdXRpb25MaW5lTnVt YmVyLAogICAgICAgICAgICAgbWVzc2FnZXM6IHRoaXMuX21lc3NhZ2VzLAotICAgICAgICAgICAg ZGlmZkxpbmVzOiB0aGlzLl9kaWZmTGluZXMKKyAgICAgICAgICAgIGRpZmZMaW5lczogdGhpcy5f ZGlmZkxpbmVzLAorICAgICAgICAgICAgYnJlYWtwb2ludHM6IHRoaXMuX2JyZWFrcG9pbnRzCiAg ICAgICAgIH07CiAgICAgfSwKIApAQCAtMTk1LDYgKzE5OCwxOSBAQCBXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5jbGVhckV4ZWN1dGlvbkxp bmUoKTsKICAgICAgICAgICAgIHRoaXMuc2V0RXhlY3V0aW9uTGluZSh0aGlzLl92aWV3ZXJTdGF0 ZS5leGVjdXRpb25MaW5lTnVtYmVyKTsKICAgICAgICAgfQorCisgICAgICAgIHZhciBvbGRCcmVh a3BvaW50cyA9IHRoaXMuX2JyZWFrcG9pbnRzOworICAgICAgICB0aGlzLl9icmVha3BvaW50cyA9 IHt9OworICAgICAgICBmb3IgKHZhciBsaW5lTnVtYmVyIGluIG9sZEJyZWFrcG9pbnRzKQorICAg ICAgICAgICAgdGhpcy5yZW1vdmVCcmVha3BvaW50KE51bWJlcihsaW5lTnVtYmVyKSk7CisKKyAg ICAgICAgdmFyIG5ld0JyZWFrcG9pbnRzID0gdGhpcy5fdmlld2VyU3RhdGUuYnJlYWtwb2ludHM7 CisgICAgICAgIGZvciAodmFyIGxpbmVOdW1iZXIgaW4gbmV3QnJlYWtwb2ludHMpIHsKKyAgICAg ICAgICAgIGxpbmVOdW1iZXIgPSBOdW1iZXIobGluZU51bWJlcik7CisgICAgICAgICAgICB2YXIg YnJlYWtwb2ludCA9IG5ld0JyZWFrcG9pbnRzW2xpbmVOdW1iZXJdOworICAgICAgICAgICAgdGhp cy5hZGRCcmVha3BvaW50KGxpbmVOdW1iZXIsIGJyZWFrcG9pbnQucmVzb2x2ZWQsIGJyZWFrcG9p bnQuY29uZGl0aW9uYWwsIGJyZWFrcG9pbnQuZW5hYmxlZCk7CisgICAgICAgIH0KKwogICAgICAg ICBkZWxldGUgdGhpcy5fdmlld2VyU3RhdGU7CiAgICAgfSwKIApAQCAtMjEzLDIwICsyMjksMzkg QEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAg IC8vIEFkanVzdCBleGVjdXRpb24gbGluZSBudW1iZXIuCiAgICAgICAgIGlmICh0eXBlb2YgdGhp cy5fZXhlY3V0aW9uTGluZU51bWJlciA9PT0gIm51bWJlciIpIHsKLSAgICAgICAgICAgIHZhciBs aW5lTnVtYmVyID0gdGhpcy5fZXhlY3V0aW9uTGluZU51bWJlcjsKLSAgICAgICAgICAgIHZhciBz aGlmdE9mZnNldCA9IGxpbmVOdW1iZXIgPD0gb2xkUmFuZ2Uuc3RhcnRMaW5lID8gMCA6IG5ld1Jh bmdlLmxpbmVzQ291bnQgLSBvbGRSYW5nZS5saW5lc0NvdW50OwotCi0gICAgICAgICAgICAvLyBT cGVjaWFsIGNhc2Ugb2YgZWRpdGluZyB0aGUgZXhlY3V0aW9uIGxpbmUgaXRzZWxmLiBXZSBzaG91 bGQgZGVjaWRlIHdoZXRoZXIgdGhlIGV4ZWN1dGlvbiBsaW5lIG51bWJlciBzaG91bGQgbW92ZSBi ZWxvdyBvciBub3QuCi0gICAgICAgICAgICBpZiAobGluZU51bWJlciA9PT0gb2xkUmFuZ2Uuc3Rh cnRMaW5lICYmIGxpbmVOdW1iZXIgKyAxIDw9IG5ld1JhbmdlLmVuZExpbmUgJiYgdGhpcy5fdGV4 dE1vZGVsLmxpbmVMZW5ndGgobGluZU51bWJlcikgPCB0aGlzLl90ZXh0TW9kZWwubGluZUxlbmd0 aChsaW5lTnVtYmVyICsgMSkpCi0gICAgICAgICAgICAgICAgc2hpZnRPZmZzZXQgPSAxOwotCi0g ICAgICAgICAgICB2YXIgbmV3RXhlY3V0aW9uTGluZU51bWJlciA9IE1hdGgubWF4KDAsIGxpbmVO dW1iZXIgKyBzaGlmdE9mZnNldCk7Ci0gICAgICAgICAgICBpZiAob2xkUmFuZ2Uuc3RhcnRMaW5l IDwgbGluZU51bWJlciAmJiBsaW5lTnVtYmVyIDwgb2xkUmFuZ2UuZW5kTGluZSkKLSAgICAgICAg ICAgICAgICBuZXdFeGVjdXRpb25MaW5lTnVtYmVyID0gb2xkUmFuZ2Uuc3RhcnRMaW5lOwotCisg ICAgICAgICAgICB2YXIgbmV3RXhlY3V0aW9uTGluZU51bWJlciA9IHRoaXMuX2xpbmVOdW1iZXJB ZnRlckVkaXRpbmcodGhpcy5fZXhlY3V0aW9uTGluZU51bWJlciwgb2xkUmFuZ2UsIG5ld1Jhbmdl KTsKICAgICAgICAgICAgIHRoaXMuY2xlYXJFeGVjdXRpb25MaW5lKCk7CiAgICAgICAgICAgICB0 aGlzLnNldEV4ZWN1dGlvbkxpbmUobmV3RXhlY3V0aW9uTGluZU51bWJlciwgdHJ1ZSk7CiAgICAg ICAgIH0KKworICAgICAgICAvLyBBZGp1c3QgYnJlYWtwb2ludHMuCisgICAgICAgIHZhciBvbGRC cmVha3BvaW50cyA9IHRoaXMuX2JyZWFrcG9pbnRzOworICAgICAgICB0aGlzLl9icmVha3BvaW50 cyA9IHt9OworICAgICAgICBmb3IgKHZhciBsaW5lTnVtYmVyIGluIG9sZEJyZWFrcG9pbnRzKSB7 CisgICAgICAgICAgICBsaW5lTnVtYmVyID0gTnVtYmVyKGxpbmVOdW1iZXIpOworICAgICAgICAg ICAgdmFyIGJyZWFrcG9pbnQgPSBvbGRCcmVha3BvaW50c1tsaW5lTnVtYmVyXTsKKyAgICAgICAg ICAgIHZhciBuZXdMaW5lTnVtYmVyID0gdGhpcy5fbGluZU51bWJlckFmdGVyRWRpdGluZyhsaW5l TnVtYmVyLCBvbGRSYW5nZSwgbmV3UmFuZ2UpOworICAgICAgICAgICAgaWYgKGxpbmVOdW1iZXIg PT09IG5ld0xpbmVOdW1iZXIpCisgICAgICAgICAgICAgICAgdGhpcy5fYnJlYWtwb2ludHNbbGlu ZU51bWJlcl0gPSBicmVha3BvaW50OworICAgICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAg ICAgdGhpcy5yZW1vdmVCcmVha3BvaW50KGxpbmVOdW1iZXIpOworICAgICAgICAgICAgICAgIHRo aXMuYWRkQnJlYWtwb2ludChuZXdMaW5lTnVtYmVyLCBicmVha3BvaW50LnJlc29sdmVkLCBicmVh a3BvaW50LmNvbmRpdGlvbmFsLCBicmVha3BvaW50LmVuYWJsZWQpOworICAgICAgICAgICAgfQor ICAgICAgICB9CisgICAgfSwKKworICAgIF9saW5lTnVtYmVyQWZ0ZXJFZGl0aW5nOiBmdW5jdGlv bihsaW5lTnVtYmVyLCBvbGRSYW5nZSwgbmV3UmFuZ2UpCisgICAgeworICAgICAgICB2YXIgc2hp ZnRPZmZzZXQgPSBsaW5lTnVtYmVyIDw9IG9sZFJhbmdlLnN0YXJ0TGluZSA/IDAgOiBuZXdSYW5n ZS5saW5lc0NvdW50IC0gb2xkUmFuZ2UubGluZXNDb3VudDsKKworICAgICAgICAvLyBTcGVjaWFs IGNhc2Ugb2YgZWRpdGluZyB0aGUgbGluZSBpdHNlbGYuIFdlIHNob3VsZCBkZWNpZGUgd2hldGhl ciB0aGUgbGluZSBudW1iZXIgc2hvdWxkIG1vdmUgYmVsb3cgb3Igbm90LgorICAgICAgICBpZiAo bGluZU51bWJlciA9PT0gb2xkUmFuZ2Uuc3RhcnRMaW5lICYmIGxpbmVOdW1iZXIgKyAxIDw9IG5l d1JhbmdlLmVuZExpbmUgJiYgdGhpcy5fdGV4dE1vZGVsLmxpbmVMZW5ndGgobGluZU51bWJlcikg PCB0aGlzLl90ZXh0TW9kZWwubGluZUxlbmd0aChsaW5lTnVtYmVyICsgMSkpCisgICAgICAgICAg ICBzaGlmdE9mZnNldCA9IDE7CisKKyAgICAgICAgdmFyIG5ld0xpbmVOdW1iZXIgPSBNYXRoLm1h eCgwLCBsaW5lTnVtYmVyICsgc2hpZnRPZmZzZXQpOworICAgICAgICBpZiAob2xkUmFuZ2Uuc3Rh cnRMaW5lIDwgbGluZU51bWJlciAmJiBsaW5lTnVtYmVyIDwgb2xkUmFuZ2UuZW5kTGluZSkKKyAg ICAgICAgICAgIG5ld0xpbmVOdW1iZXIgPSBvbGRSYW5nZS5zdGFydExpbmU7CisgICAgICAgIHJl dHVybiBuZXdMaW5lTnVtYmVyOwogICAgIH0sCiAKICAgICBfY3JlYXRlVGV4dFZpZXdlcjogZnVu Y3Rpb24obWltZVR5cGUsIGNvbnRlbnQpCkBAIC01MTQsNiArNTQ5LDExIEBAIFdlYkluc3BlY3Rv ci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAKICAgICBhZGRCcmVha3BvaW50OiBmdW5jdGlv bihsaW5lTnVtYmVyLCByZXNvbHZlZCwgY29uZGl0aW9uYWwsIGVuYWJsZWQpCiAgICAgeworICAg ICAgICB0aGlzLl9icmVha3BvaW50c1tsaW5lTnVtYmVyXSA9IHsKKyAgICAgICAgICAgIHJlc29s dmVkOiByZXNvbHZlZCwKKyAgICAgICAgICAgIGNvbmRpdGlvbmFsOiBjb25kaXRpb25hbCwKKyAg ICAgICAgICAgIGVuYWJsZWQ6IGVuYWJsZWQKKyAgICAgICAgfTsKICAgICAgICAgdGhpcy5fdGV4 dFZpZXdlci5iZWdpblVwZGF0ZXMoKTsKICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5hZGREZWNv cmF0aW9uKGxpbmVOdW1iZXIsICJ3ZWJraXQtYnJlYWtwb2ludCIpOwogICAgICAgICBpZiAoIWVu YWJsZWQpCkBAIC01MjUsNiArNTY1LDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3Rv dHlwZSA9IHsKIAogICAgIHJlbW92ZUJyZWFrcG9pbnQ6IGZ1bmN0aW9uKGxpbmVOdW1iZXIpCiAg ICAgeworICAgICAgICBkZWxldGUgdGhpcy5fYnJlYWtwb2ludHNbbGluZU51bWJlcl07CiAgICAg ICAgIHRoaXMuX3RleHRWaWV3ZXIuYmVnaW5VcGRhdGVzKCk7CiAgICAgICAgIHRoaXMuX3RleHRW aWV3ZXIucmVtb3ZlRGVjb3JhdGlvbihsaW5lTnVtYmVyLCAid2Via2l0LWJyZWFrcG9pbnQiKTsK ICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5yZW1vdmVEZWNvcmF0aW9uKGxpbmVOdW1iZXIsICJ3 ZWJraXQtYnJlYWtwb2ludC1kaXNhYmxlZCIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCmluZGV4IGNlYWVlOWY2YzlkODllMzY4NzAwNzIz N2E2OTI4NWMwYzVkZDYzNWYuLmI2ZTc1Y2Y0ZWY3ZTRlODVlNGE1MGVjNGRlY2I0ODg5NjBiMWMx M2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZp ZXdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3 ZXIuanMKQEAgLTIxOCw3ICsyMTgsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dFZpZXdlci5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdmFyIG1haW5DaHVuayA9IHRo aXMuX21haW5QYW5lbC5jaHVua0ZvckxpbmUobGluZU51bWJlcik7Ci0gICAgICAgIGlmIChtYWlu Q2h1bmsubGluZXNDb3VudCA9PT0gMSkgeworICAgICAgICBpZiAobWFpbkNodW5rLmxpbmVzQ291 bnQgPT09IDEgJiYgbWFpbkNodW5rLmRlY29yYXRlZCkgewogICAgICAgICAgICAgdmFyIGd1dHRl ckNodW5rID0gdGhpcy5fZ3V0dGVyUGFuZWwubWFrZUxpbmVBQ2h1bmsobGluZU51bWJlcik7CiAg ICAgICAgICAgICB2YXIgaGVpZ2h0ID0gbWFpbkNodW5rLmhlaWdodDsKICAgICAgICAgICAgIGlm IChoZWlnaHQpCkBAIC0yNzEsNyArMjcxLDcgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JDaHVu a2VkUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBpZiAobGluZU51bWJlciA+PSB0aGlzLl90 ZXh0TW9kZWwubGluZXNDb3VudCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB2YXIg Y2h1bmsgPSB0aGlzLm1ha2VMaW5lQUNodW5rKGxpbmVOdW1iZXIpOworICAgICAgICB2YXIgY2h1 bmsgPSB0aGlzLmNodW5rRm9yTGluZShsaW5lTnVtYmVyKTsKICAgICAgICAgY2h1bmsucmVtb3Zl RGVjb3JhdGlvbihkZWNvcmF0aW9uKTsKICAgICB9LAogCkBAIC0zMDgsOCArMzA4LDE0IEBAIFdl Ykluc3BlY3Rvci5UZXh0RWRpdG9yQ2h1bmtlZFBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAg aWYgKG9sZENodW5rLmxpbmVzQ291bnQgPT09IDEpCiAgICAgICAgICAgICByZXR1cm4gb2xkQ2h1 bms7CiAKKyAgICAgICAgcmV0dXJuIHRoaXMuX3NwbGl0Q2h1bmtPbkFMaW5lKGxpbmVOdW1iZXIs IGNodW5rTnVtYmVyKTsKKyAgICB9LAorCisgICAgX3NwbGl0Q2h1bmtPbkFMaW5lOiBmdW5jdGlv bihsaW5lTnVtYmVyLCBjaHVua051bWJlcikKKyAgICB7CiAgICAgICAgIHRoaXMuYmVnaW5Eb21V cGRhdGVzKCk7CiAKKyAgICAgICAgdmFyIG9sZENodW5rID0gdGhpcy5fdGV4dENodW5rc1tjaHVu a051bWJlcl07CiAgICAgICAgIHZhciB3YXNFeHBhbmRlZCA9IG9sZENodW5rLmV4cGFuZGVkOwog ICAgICAgICBvbGRDaHVuay5leHBhbmRlZCA9IGZhbHNlOwogCkBAIC04MDUsMTAgKzgxMSwxMCBA QCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAg IHRoaXMuX2NhY2hlZFJvd3MgPSBbXTsKICAgICB9LAogCi0gICAgbWFrZUxpbmVBQ2h1bms6IGZ1 bmN0aW9uKGxpbmVOdW1iZXIpCisgICAgX3NwbGl0Q2h1bmtPbkFMaW5lOiBmdW5jdGlvbihsaW5l TnVtYmVyLCBjaHVua051bWJlcikKICAgICB7CiAgICAgICAgIHZhciBzZWxlY3Rpb24gPSB0aGlz Ll9nZXRTZWxlY3Rpb24oKTsKLSAgICAgICAgdmFyIGNodW5rID0gV2ViSW5zcGVjdG9yLlRleHRF ZGl0b3JDaHVua2VkUGFuZWwucHJvdG90eXBlLm1ha2VMaW5lQUNodW5rLmNhbGwodGhpcywgbGlu ZU51bWJlcik7CisgICAgICAgIHZhciBjaHVuayA9IFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yQ2h1 bmtlZFBhbmVsLnByb3RvdHlwZS5fc3BsaXRDaHVua09uQUxpbmUuY2FsbCh0aGlzLCBsaW5lTnVt YmVyLCBjaHVua051bWJlcik7CiAgICAgICAgIHRoaXMuX3Jlc3RvcmVTZWxlY3Rpb24oc2VsZWN0 aW9uKTsKICAgICAgICAgcmV0dXJuIGNodW5rOwogICAgIH0sCg==