137078 2014-09-24 15:48:16 -0700 Web Inspector: support replaying to time-indexed outputs 2017-07-10 14:01:25 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED LATER InRadar P2 Normal --- 137079 137083 137162 136292 1 burg webkit-unassigned graouts inspector-bugzilla-changes syoichi webkit-bug-importer oldest_to_newest 1037050 0 burg 2014-09-24 15:48:16 -0700 The idea of time-indexed outputs is that the user often wants to navigate a recording by console outputs or probe samples gathered during the playback. We can do that using replay and breakpoints. <brrian> Given a position in a recording and a source code position and a count, the replayToIndexedStatement(PlaybackPosition, url, SourcePosition, count) command replays to the count'th execution of the statement at that position starting from the recording position. count is relative to the combination of PlaybackPosition+SourceCodeLocation. <brrian> So, if you can tag outputs with a counter value that resets for each replay input, you can replay to any output that's tagged. 1037052 1 webkit-bug-importer 2014-09-24 15:49:34 -0700 <rdar://problem/18447456> 1037053 2 webkit-bug-importer 2014-09-24 15:49:35 -0700 <rdar://problem/18447455> 1037056 3 burg 2014-09-24 15:55:11 -0700 (In reply to comment #2) > <rdar://problem/18447455> Double-imported :( 1037070 4 238620 burg 2014-09-24 16:14:17 -0700 Created attachment 238620 WIP 1037150 5 238620 timothy 2014-09-24 21:34:47 -0700 Comment on attachment 238620 WIP View in context: https://bugs.webkit.org/attachment.cgi?id=238620&action=review > Source/WebInspectorUI/UserInterface/Controllers/ReplayManager.js:482 > + // Disable the breakpoints that are unrelated to this command. > + for (var breakpoint of WebInspector.debuggerManager.breakpoints) { > + breakpointStateMap.set(breakpoint, breakpoint.disabled); > + breakpoint.disabled = true; > + } This likely fires a bunch of events that are pointless and confuse the UI. Should we suppress them? > Source/WebInspectorUI/UserInterface/Controllers/ReplayManager.js:538 > + manager.playbackSpeed = WebInspector.ReplayManager.PlaybackSpeed.RealTime; > + for (var [breakpoint, wasDisabled] of breakpointStateMap) > + breakpoint.disabled = wasDisabled; What happens if the user toggled one since the state was stored? 1327162 6 bburg 2017-07-10 14:01:25 -0700 Closing web replay-related bugs until we resume working on the feature again. 238620 2014-09-24 16:14:17 -0700 2014-09-24 21:34:47 -0700 WIP bug-137078-20140924161410.patch text/plain 9313 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTczODAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0V2ZW50TGlzdGVuZXIuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0V2ZW50TGlzdGVuZXIuanMKaW5kZXggMTBmMTc1 NGY5Yjk3ZDBmZWFmNTllZTg0ZjgxYmE1OGUxNThjZmEzMS4uMTdlMTIwNjQ5NjUyMWI1NThkY2I5 ZjBkMmI3ZmE5ZTEzZTU1YmI1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQmFzZS9FdmVudExpc3RlbmVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvRXZlbnRMaXN0ZW5lci5qcwpAQCAtMzMsNiArMzMsMTEg QEAgV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXIgPSBmdW5jdGlvbih0aGlzT2JqZWN0LCBmaXJl T25jZSkKIH07CiAKIFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyLnByb3RvdHlwZSA9IHsKKyAg ICBpc0FjdGl2ZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2VtaXR0 ZXIgJiYgdGhpcy5fY2FsbGJhY2s7CisgICAgfSwKKwogICAgIGNvbm5lY3Q6IGZ1bmN0aW9uKGVt aXR0ZXIsIHR5cGUsIGNhbGxiYWNrLCB1c2VzQ2FwdHVyZSkKICAgICB7CiAgICAgICAgIGNvbnNv bGUuYXNzZXJ0KCF0aGlzLl9lbWl0dGVyICYmICF0aGlzLl9jYWxsYmFjaywgIkV2ZW50TGlzdGVu ZXIgYWxyZWFkeSBib3VuZCB0byBhIGNhbGxiYWNrLiIsIHRoaXMpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvUmVwbGF5TWFuYWdl ci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1Jl cGxheU1hbmFnZXIuanMKaW5kZXggNWZiNTZlZWEyNzQwM2ZkMjY0Nzc0MWI5NmUzZmE1YzBiZWIw Mjg5ZC4uMmM3MjRjNzRmMWNjMGI5NDk1MDU0NmM0Y2E5YjRmZjM5MjVmZDk3OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvUmVwbGF5 TWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250 cm9sbGVycy9SZXBsYXlNYW5hZ2VyLmpzCkBAIC00MzQsNiArNDM0LDEzMyBAQCBXZWJJbnNwZWN0 b3IuUmVwbGF5TWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAg ICAgfSwKIAorICAgIHJlcGxheVRvSW5kZXhlZFN0YXRlbWVudDogZnVuY3Rpb24ocmVwbGF5UG9z aXRpb24sIHVybCwgZmlsZVBvc2l0aW9uLCBjb3VudGVyVmFsdWUpCisgICAgeworICAgICAgICAv LyBEb24ndCB1c2UgYSBTb3VyY2VDb2RlTG9jYXRpb24gYmVjYXVzZSB0aGUgcmVmZXJlbmNlZCBz dGF0ZW1lbnQgbWF5IG5vdCB5ZXQgYmUgcGFyc2VkLgorICAgICAgICBjb25zb2xlLmFzc2VydChy ZXBsYXlQb3NpdGlvbiBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5SZXBsYXlQb3NpdGlvbiwgcmVw bGF5UG9zaXRpb24pOworICAgICAgICBjb25zb2xlLmFzc2VydChmaWxlUG9zaXRpb24gaW5zdGFu Y2VvZiBXZWJJbnNwZWN0b3IuU291cmNlQ29kZVBvc2l0aW9uLCBmaWxlUG9zaXRpb24pOworCisg ICAgICAgIC8vIFdlIGV4cGVjdCBwbGF5YmFjayB0byBwYXVzZSBqdXN0IG9uY2UsIGJ1dCB0aGUg ZGVidWdnZXIgc2hvdWxkIHBhdXNlIGNvdW50ZXJWYWx1ZS0xIHRpbWVzLgorICAgICAgICB2YXIg cGxheWJhY2tQYXVzZUxpc3RlbmVyID0gbmV3IFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyKHRo aXMsIHRydWUpOworICAgICAgICB2YXIgYnJlYWtwb2ludFJlc29sdmVkTGlzdGVuZXIgPSBuZXcg V2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXIodGhpcywgdHJ1ZSk7CisgICAgICAgIHZhciBkZWJ1 Z2dlclBhdXNlTGlzdGVuZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXIodGhpcywg ZmFsc2UpOworCisgICAgICAgIHZhciBtYW5hZ2VyID0gdGhpczsKKyAgICAgICAgdmFyIHJlc3Vs dCA9IHRoaXMud2FpdFVudGlsSW5pdGlhbGl6ZWQoKTsKKworICAgICAgICB2YXIgdGVtcG9yYXJ5 QnJlYWtwb2ludCA9IG51bGw7CisgICAgICAgIHZhciBicmVha3BvaW50U3RhdGVNYXAgPSBuZXcg TWFwOworCisgICAgICAgIGNvbnNvbGUubG9nKCJTdGFydGluZyByZXBsYXlUb0luZGV4ZWRTdGF0 ZW1lbnQ6IiwgcmVwbGF5UG9zaXRpb24sIHVybCwgZmlsZVBvc2l0aW9uLCBjb3VudGVyVmFsdWUp OworCisgICAgICAgIHJlc3VsdCA9IHJlc3VsdC50aGVuKGZ1bmN0aW9uKCkgeworICAgICAgICAg ICAgbWFuYWdlci5wbGF5YmFja1NwZWVkID0gV2ViSW5zcGVjdG9yLlJlcGxheU1hbmFnZXIuUGxh eWJhY2tTcGVlZC5GYXN0Rm9yd2FyZDsKKyAgICAgICAgICAgIHZhciBzaG91bGRTdXBwcmVzc0Jy ZWFrcG9pbnRzID0gdHJ1ZTsKKworICAgICAgICAgICAgY29uc29sZS5sb2coInJlcGxheVRvSW5k ZXhlZFN0YXRlbWVudDogcmVwbGF5aW5nIHRvIHBvc2l0aW9uICIsIHJlcGxheVBvc2l0aW9uKTsK KworICAgICAgICAgICAgcmV0dXJuIG1hbmFnZXIucmVwbGF5VG9Qb3NpdGlvbihyZXBsYXlQb3Np dGlvbiwgc2hvdWxkU3VwcHJlc3NCcmVha3BvaW50cyk7CisgICAgICAgIH0pOworICAgICAgICBy ZXN1bHQgPSByZXN1bHQudGhlbihmdW5jdGlvbiB3YWl0Rm9yUGxheWJhY2tQYXVzZSgpIHsKKyAg ICAgICAgICAgIGNvbnNvbGUubG9nKCJyZXBsYXlUb0luZGV4ZWRTdGF0ZW1lbnQ6IHdhaXRpbmcg Zm9yIHBhdXNlIGF0ICIsIHJlcGxheVBvc2l0aW9uKTsKKworICAgICAgICAgICAgcmV0dXJuIG5l dyBXZWJJbnNwZWN0b3IuUHJvbWlzZShmdW5jdGlvbiAocmVzb2x2ZSwgcmVqZWN0KSB7CisgICAg ICAgICAgICAgICAgcGxheWJhY2tQYXVzZUxpc3RlbmVyLmNvbm5lY3QobWFuYWdlciwgV2ViSW5z cGVjdG9yLlJlcGxheU1hbmFnZXIuRXZlbnQuUGxheWJhY2tQYXVzZWQsIHJlc29sdmUpOworICAg ICAgICAgICAgfSk7CisgICAgICAgIH0pOworICAgICAgICByZXN1bHQgPSByZXN1bHQudGhlbihm dW5jdGlvbiBzZXRCcmVha3BvaW50Rm9yU3RhdGVtZW50KCkgeworCisgICAgICAgICAgICBjb25z b2xlLmxvZygicGF1c2VkIGF0ICIsIG1hbmFnZXIucGxheWJhY2tQb3NpdGlvbiwgImV4cGVjdGVk OiAiLCByZXBsYXlQb3NpdGlvbik7CisgICAgICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLlJlcGxh eVBvc2l0aW9uLmNvbXBhcmF0b3IobWFuYWdlci5wbGF5YmFja1Bvc2l0aW9uLCByZXBsYXlQb3Np dGlvbikgIT09IDApCisgICAgICAgICAgICAgICAgdGhyb3cgbmV3IEVycm9yKCJQbGF5YmFjayBw YXVzZWQgYXQgdGhlIHdyb25nIHJlcGxheSBwb3NpdGlvbiEiKTsKKworICAgICAgICAgICAgV2Vi SW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5icmVha3BvaW50c0VuYWJsZWQgPSB0cnVlOworICAg ICAgICAgICAgLy8gRGlzYWJsZSB0aGUgYnJlYWtwb2ludHMgdGhhdCBhcmUgdW5yZWxhdGVkIHRv IHRoaXMgY29tbWFuZC4KKyAgICAgICAgICAgIGZvciAodmFyIGJyZWFrcG9pbnQgb2YgV2ViSW5z cGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5icmVha3BvaW50cykgeworICAgICAgICAgICAgICAgIGJy ZWFrcG9pbnRTdGF0ZU1hcC5zZXQoYnJlYWtwb2ludCwgYnJlYWtwb2ludC5kaXNhYmxlZCk7Cisg ICAgICAgICAgICAgICAgYnJlYWtwb2ludC5kaXNhYmxlZCA9IHRydWU7CisgICAgICAgICAgICB9 CisKKyAgICAgICAgICAgIC8vIE1ha2UgYSBicmVha3BvaW50IGZvciB0aGUgc3BlY2lmaWVkIHVy bCBhbmQgcG9zaXRpb24uCisgICAgICAgICAgICB2YXIgc291cmNlQ29kZSA9IFdlYkluc3BlY3Rv ci5mcmFtZVJlc291cmNlTWFuYWdlci5yZXNvdXJjZUZvclVSTCh1cmwpOworICAgICAgICAgICAg aWYgKCFzb3VyY2VDb2RlKSB7CisgICAgICAgICAgICAgICAgc291cmNlQ29kZSA9IFdlYkluc3Bl Y3Rvci5kZWJ1Z2dlck1hbmFnZXIuc2NyaXB0c0ZvclVSTCh1cmwpWzBdOworICAgICAgICAgICAg ICAgIGlmIChzb3VyY2VDb2RlKQorICAgICAgICAgICAgICAgICAgICBzb3VyY2VDb2RlID0gc291 cmNlQ29kZS5yZXNvdXJjZSB8fCBzb3VyY2VDb2RlOworICAgICAgICAgICAgfQorICAgICAgICAg ICAgaWYgKCFzb3VyY2VDb2RlKQorICAgICAgICAgICAgICAgIHRocm93IG5ldyBFcnJvcigiQ291 bGRuJ3QgcmVzb2x2ZSBpbmRleGVkIHN0YXRlbWVudCB3aXRoIFVSTDogIiArIHVybCk7CisKKyAg ICAgICAgICAgIHZhciBzb3VyY2VDb2RlTG9jYXRpb24gPSBzb3VyY2VDb2RlLmNyZWF0ZVNvdXJj ZUNvZGVMb2NhdGlvbihmaWxlUG9zaXRpb24ubGluZU51bWJlciwgZmlsZVBvc2l0aW9uLmNvbHVt bk51bWJlcik7CisgICAgICAgICAgICB0ZW1wb3JhcnlCcmVha3BvaW50ID0gbmV3IFdlYkluc3Bl Y3Rvci5CcmVha3BvaW50KHNvdXJjZUNvZGVMb2NhdGlvbik7CisKKyAgICAgICAgICAgIHZhciBz aG91bGRTa2lwRXZlbnREaXNwYXRjaCA9IGZhbHNlOworICAgICAgICAgICAgdmFyIHNob3VsZFNw ZWN1bGF0aXZlbHlSZXNvbHZlID0gZmFsc2U7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZGVi dWdnZXJNYW5hZ2VyLmFkZEJyZWFrcG9pbnQodGVtcG9yYXJ5QnJlYWtwb2ludCwgc2hvdWxkU2tp cEV2ZW50RGlzcGF0Y2gsIHNob3VsZFNwZWN1bGF0aXZlbHlSZXNvbHZlKTsKKworICAgICAgICAg ICAgY29uc29sZS5sb2coInJlcGxheVRvSW5kZXhlZFN0YXRlbWVudDogd2FpdGluZyB0byByZXNv bHZlIGJyZWFrcG9pbnQgIiwgYnJlYWtwb2ludCk7CisKKyAgICAgICAgICAgIHJldHVybiBuZXcg V2ViSW5zcGVjdG9yLlByb21pc2UoZnVuY3Rpb24ocmVzb2x2ZSwgcmVqZWN0KSB7CisgICAgICAg ICAgICAgICAgYnJlYWtwb2ludFJlc29sdmVkTGlzdGVuZXIuY29ubmVjdCh0ZW1wb3JhcnlCcmVh a3BvaW50LCBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludC5FdmVudC5SZXNvbHZlZFN0YXRlRGlkQ2hh bmdlLCByZXNvbHZlKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9KTsKKworICAgICAgICBy ZXN1bHQgPSByZXN1bHQudGhlbihmdW5jdGlvbigpIHsKKyAgICAgICAgICAgIGNvbnNvbGUubG9n KCJyZXBsYXlUb0luZGV4ZWRTdGF0ZW1lbnQ6IHdhaXRpbmcgZm9yIHBhdXNlICMiLCBjb3VudGVy VmFsdWUpOworICAgICAgICAgICAgdmFyIHNob3VsZFN1cHByZXNzQnJlYWtwb2ludHMgPSBmYWxz ZTsKKyAgICAgICAgICAgIG1hbmFnZXIucmVwbGF5VG9Db21wbGV0aW9uKHNob3VsZFN1cHByZXNz QnJlYWtwb2ludHMpOworCisgICAgICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5Qcm9t aXNlKGZ1bmN0aW9uKHJlc29sdmUsIHJlamVjdCkgeworICAgICAgICAgICAgICAgIHZhciBwYXVz ZUNvdW50ZXIgPSBOYU47CisgICAgICAgICAgICAgICAgZnVuY3Rpb24gaGFuZGxlRGVidWdnZXJQ YXVzZShmaW5pc2hlZENhbGxiYWNrKSB7CisgICAgICAgICAgICAgICAgICAgIHBhdXNlQ291bnRl ciA9IGlzTmFOKHBhdXNlQ291bnRlcikgPyAwIDogcGF1c2VDb3VudGVyICsgMTsKKyAgICAgICAg ICAgICAgICAgICAgY29uc29sZS5sb2coInJlcGxheVRvSW5kZXhlZFN0YXRlbWVudDogc2F3IHBh dXNlICMiLCBwYXVzZUNvdW50ZXIsICJvZiIsIGNvdW50ZXJWYWx1ZSk7CisKKyAgICAgICAgICAg ICAgICAgICAgaWYgKHBhdXNlQ291bnRlciA9PT0gY291bnRlclZhbHVlKSB7CisgICAgICAgICAg ICAgICAgICAgICAgICBjb25zb2xlLmxvZygicmVwbGF5VG9JbmRleGVkU3RhdGVtZW50OiByZXNv bHZpbmciKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGZpbmlzaGVkQ2FsbGJhY2soKTsKKyAg ICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnNv bGUubG9nKCJyZXBsYXlUb0luZGV4ZWRTdGF0ZW1lbnQ6IHJlc3VtaW5nIik7CisgICAgICAgICAg ICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2VyLnJlc3VtZSgpOworICAg ICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGRl YnVnZ2VyUGF1c2VMaXN0ZW5lci5jb25uZWN0KFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIs IFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1hbmFnZXIuRXZlbnQuUGF1c2VkLCBoYW5kbGVEZWJ1Z2dl clBhdXNlLmJpbmQobnVsbCwgcmVzb2x2ZSkpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0p OworCisgICAgICAgIHJlc3VsdCA9IHJlc3VsdC50aGVuKGZ1bmN0aW9uIHJlc3RvcmVPcmlnaW5h bFN0YXRlKCkgeworICAgICAgICAgICAgY29uc29sZS5sb2coInJlcGxheVRvSW5kZXhlZFN0YXRl bWVudDogcmVzdG9yaW5nIG9yaWdpbmFsIHN0YXRlIik7CisKKyAgICAgICAgICAgIFdlYkluc3Bl Y3Rvci5kZWJ1Z2dlck1hbmFnZXIucmVtb3ZlQnJlYWtwb2ludCh0ZW1wb3JhcnlCcmVha3BvaW50 KTsKKworICAgICAgICAgICAgbWFuYWdlci5wbGF5YmFja1NwZWVkID0gV2ViSW5zcGVjdG9yLlJl cGxheU1hbmFnZXIuUGxheWJhY2tTcGVlZC5SZWFsVGltZTsKKyAgICAgICAgICAgIGZvciAodmFy IFticmVha3BvaW50LCB3YXNEaXNhYmxlZF0gb2YgYnJlYWtwb2ludFN0YXRlTWFwKQorICAgICAg ICAgICAgICAgIGJyZWFrcG9pbnQuZGlzYWJsZWQgPSB3YXNEaXNhYmxlZDsKKworICAgICAgICAg ICAgLy8gRklYTUU6IHdlIGRpZG4ndCBwcm9wZXJseSBzYXZlIGFuZCByZXN0b3JlIHRoZSByZXBs YXkgc3BlZWQgb3IgZGVidWdnZXIgZW5hYmxlZCBzdGF0ZS4KKworICAgICAgICAgICAgZGVidWdn ZXJQYXVzZUxpc3RlbmVyLmRpc2Nvbm5lY3QoKTsKKyAgICAgICAgfSk7CisKKyAgICAgICAgcmVz dWx0ID0gcmVzdWx0LmNhdGNoKGZ1bmN0aW9uKGVycm9yKSB7CisgICAgICAgICAgICBjb25zb2xl LmxvZygicmVwbGF5VG9JbmRleGVkU3RhdGVtZW50OiBoaXQgdGhlIGNhdGNoIGNsYXVzZSIpOwor CisgICAgICAgICAgICBpZiAocGxheWJhY2tQYXVzZUxpc3RlbmVyLmlzQWN0aXZlKCkpCisgICAg ICAgICAgICAgICAgcGxheWJhY2tQYXVzZUxpc3RlbmVyLmRpc2Nvbm5lY3QoKTsKKworICAgICAg ICAgICAgaWYgKGJyZWFrcG9pbnRSZXNvbHZlZExpc3RlbmVyLmlzQWN0aXZlKCkpCisgICAgICAg ICAgICAgICAgYnJlYWtwb2ludFJlc29sdmVkTGlzdGVuZXIuZGlzY29ubmVjdCgpOworCisgICAg ICAgICAgICBpZiAoZGVidWdnZXJQYXVzZUxpc3RlbmVyLmlzQWN0aXZlKCkpCisgICAgICAgICAg ICAgICAgZGVidWdnZXJQYXVzZUxpc3RlbmVyLmRpc2Nvbm5lY3QoKTsKKworICAgICAgICAgICAg Y29uc29sZS5lcnJvcigiRmFpbGVkIHRvIHJlcGxheSB0byBpbmRleGVkIHN0YXRlbWVudDogIiwg ZXJyb3IpOworICAgICAgICAgICAgdGhyb3cgZXJyb3I7CisgICAgICAgIH0pOworCisgICAgICAg IHJldHVybiByZXN1bHQ7CisgICAgfSwKKwogICAgIC8vIFByb3RlY3RlZCAoY2FsbGVkIGJ5IFJl cGxheU9ic2VydmVyKQogCiAgICAgLy8gU2luY2UgdGhlc2UgbWV0aG9kcyB1cGRhdGUgc2Vzc2lv biBhbmQgc2VnbWVudCBzdGF0ZSwgdGhleSBkZXBlbmQgb24gdGhlIG1hbmFnZXIKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2JlU2V0RGF0 YUdyaWQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qcm9i ZVNldERhdGFHcmlkLmpzCmluZGV4IDM1MDU0Nzg1YmY2ZWY0Nzg2NjFmZjlkODU4MDZlMzFjNTRj YTdhOGQuLjZkYzA4OTkwMTE0ZGZiZmNjOTI2MzI4ZWMzMjE3ZGQ3MWFhZGM3NGYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2JlU2V0RGF0 YUdyaWQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv UHJvYmVTZXREYXRhR3JpZC5qcwpAQCAtNDgsNiArNDgsNyBAQCBXZWJJbnNwZWN0b3IuUHJvYmVT ZXREYXRhR3JpZCA9IGZ1bmN0aW9uKHByb2JlU2V0KQogICAgIHRoaXMuX2xpc3RlbmVycy5yZWdp c3Rlcihwcm9iZVNldCwgV2ViSW5zcGVjdG9yLlByb2JlU2V0LkV2ZW50LlNhbXBsZXNDbGVhcmVk LCB0aGlzLl9zZXR1cERhdGEpOwogICAgIHRoaXMuX2xpc3RlbmVycy5yZWdpc3RlcihXZWJJbnNw ZWN0b3IuUHJvYmUsIFdlYkluc3BlY3Rvci5Qcm9iZS5FdmVudC5FeHByZXNzaW9uQ2hhbmdlZCwg dGhpcy5fcHJvYmVFeHByZXNzaW9uQ2hhbmdlZCk7CiAgICAgdGhpcy5fbGlzdGVuZXJzLnJlZ2lz dGVyKFdlYkluc3BlY3Rvci5yZXBsYXlNYW5hZ2VyLCBXZWJJbnNwZWN0b3IuUmVwbGF5TWFuYWdl ci5FdmVudC5BY3RpdmVTZWdtZW50Q2hhbmdlZCwgdGhpcy5fYWN0aXZlU2VnbWVudENoYW5nZWQp OworICAgIHRoaXMuX2xpc3RlbmVycy5yZWdpc3Rlcih0aGlzLmVsZW1lbnQsICJkYmxjbGljayIs IHRoaXMuX2dyaWREb3VibGVDbGlja2VkKTsKICAgICB0aGlzLl9saXN0ZW5lcnMuaW5zdGFsbCgp OwogCiAgICAgdGhpcy5fc2V0dXBEYXRhKCk7CkBAIC0xNzAsNiArMTcxLDIwIEBAIFdlYkluc3Bl Y3Rvci5Qcm9iZVNldERhdGFHcmlkLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fbm9kZXNT aW5jZUxhc3ROYXZpZ2F0aW9uID0gW107CiAgICAgfSwKIAorICAgIF9ncmlkRG91YmxlQ2xpY2tl ZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB2YXIgZ3JpZE5vZGUgPSB0aGlzLmRh dGFHcmlkTm9kZUZyb21Ob2RlKGV2ZW50LnRhcmdldCk7CisgICAgICAgIGlmICghZ3JpZE5vZGUg fHwgIWdyaWROb2RlLnNlbGVjdGFibGUpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAg dmFyIGZyYW1lID0gZ3JpZE5vZGUuZnJhbWU7CisgICAgICAgIGlmICghKGZyYW1lIGluc3RhbmNl b2YgV2ViSW5zcGVjdG9yLlByb2JlU2V0UmVwbGF5RGF0YUZyYW1lKSkKKyAgICAgICAgICAgIHJl dHVybjsKKworICAgICAgICB2YXIgYnJlYWtwb2ludCA9IHRoaXMucHJvYmVTZXQuYnJlYWtwb2lu dDsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnJlcGxheU1hbmFnZXIucmVwbGF5VG9JbmRleGVkU3Rh dGVtZW50KGZyYW1lLnBvc2l0aW9uLCBicmVha3BvaW50LnVybCwgYnJlYWtwb2ludC5zb3VyY2VD b2RlTG9jYXRpb24ucG9zaXRpb24oKSwgZnJhbWUuY291bnRlclZhbHVlKTsKKyAgICB9LAorCiAg ICAgX2RhdGFGcmFtZUluc2VydGVkOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIHZh ciBmcmFtZSA9IGV2ZW50LmRhdGE7Cg==