136015 2014-08-16 00:01:33 -0700 Web Inspector: Improve performance of selection range changes viewing Scripts timeline 2014-08-16 02:25:45 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 1029583 0 joepeck 2014-08-16 00:01:33 -0700 * SUMMARY Improve performance of selection range changes viewing Scripts timeline. Whenever a selection range changes, we update all the nodes and mark them as needing a refresh. However, we only need to refresh an element if the new selection range changed the cross-section of that particular node. For example, if the selection range was showing the entire node, and is still showing the entire node, we don't need to refresh. * STEPS TO REPRODUCE 1. Inspect iCloud.com 2. Show Timelines and Reload 3. Select Scripts timeline 4. Select a time range with a lot of scripts 5. Scrub / expand / collapse / change the time range selection => poor performance * NOTES We do still want to support "sub-event ranges". If there is a long script, you should be able to put a selection range for only part of that script evaluation and see only the Profile Nodes for that cross section. 1029584 1 webkit-bug-importer 2014-08-16 00:02:04 -0700 <rdar://problem/18040028> 1029585 2 236703 joepeck 2014-08-16 00:04:29 -0700 Created attachment 236703 [PATCH] Proposed Fix 1029593 3 236703 timothy 2014-08-16 01:53:14 -0700 Comment on attachment 236703 [PATCH] Proposed Fix Nice! 1029599 4 236703 commit-queue 2014-08-16 02:25:43 -0700 Comment on attachment 236703 [PATCH] Proposed Fix Clearing flags on attachment: 236703 Committed r172689: <http://trac.webkit.org/changeset/172689> 1029600 5 commit-queue 2014-08-16 02:25:45 -0700 All reviewed patches have been landed. Closing bug. 236703 2014-08-16 00:04:29 -0700 2014-08-16 02:25:42 -0700 [PATCH] Proposed Fix better-script.patch text/plain 9079 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDk2M2IzOTYuLmUzYzc1MWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE0LTA4LTE2ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW1wcm92 ZSBwZXJmb3JtYW5jZSBvZiBzZWxlY3Rpb24gcmFuZ2UgY2hhbmdlcyB2aWV3aW5nIFNjcmlwdHMg dGltZWxpbmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzNjAxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qczoKKyAgICAgICAgKGNsYW1wKToKKyAg ICAgICAgSGVscGVyIGZ1bmN0aW9uIHRvIGNsYW1wIGEgdmFsdWUgYmV0d2VlbiBhIG1pbiBhbmQg bWF4LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvUHJvZmlsZU5vZGUuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZU5vZGUucHJvdG90eXBlLmdldCBzdGFydFRpbWUp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVOb2RlLnByb3RvdHlwZS5nZXQgZW5kVGlt ZSk6CisgICAgICAgIFRoZXNlIGNhbiBiZSBxdWlja2x5IGNhbGN1bGF0ZWQsIHNvIGF2b2lkIGZ1 bGwgY2FsY3VsYXRpb24gdG8gZ3JhYiB0aGUgdmFsdWVzLgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9TY3JpcHRUaW1lbGluZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U2NyaXB0VGltZWxpbmVWaWV3LnByb3RvdHlwZS51cGRhdGVMYXlvdXQpOgorICAgICAgICBVcGRh dGUgcmFuZ2VzIHdpdGggYSBzbWFydCBoZWxwZXIsIGluc3RlYWQgb2YgYmxpbmRseSBkb2luZyBp dCBhbmQgbmVlZGluZyByZWZyZXNoLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Q cm9maWxlTm9kZURhdGFHcmlkTm9kZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxl Tm9kZURhdGFHcmlkTm9kZS5wcm90b3R5cGUuZ2V0IHJhbmdlRW5kVGltZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUHJvZmlsZU5vZGVEYXRhR3JpZE5vZGUucHJvdG90eXBlLmdldCBkYXRhKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlTm9kZURhdGFHcmlkTm9kZS5wcm90b3R5cGUu dXBkYXRlUmFuZ2VUaW1lcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZU5vZGVEYXRh R3JpZE5vZGUucHJvdG90eXBlLnNldCByYW5nZVN0YXJ0VGltZSk6IERlbGV0ZWQuCisgICAgICAg IChXZWJJbnNwZWN0b3IuUHJvZmlsZU5vZGVEYXRhR3JpZE5vZGUucHJvdG90eXBlLnNldCByYW5n ZUVuZFRpbWUpOiBEZWxldGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0 VGltZWxpbmVEYXRhR3JpZE5vZGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0VGlt ZWxpbmVEYXRhR3JpZE5vZGUucHJvdG90eXBlLnVwZGF0ZVJhbmdlVGltZXMpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lRGF0YUdyaWROb2RlLnByb3RvdHlwZS5zZXQgcmFu Z2VTdGFydFRpbWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVs aW5lRGF0YUdyaWROb2RlLnByb3RvdHlwZS5zZXQgcmFuZ2VFbmRUaW1lKTogRGVsZXRlZC4KKyAg ICAgICAgV2hlbiB1cGRhdGluZyB0aGUgcmFuZ2Ugc2VsZWN0aW9uLCBjb21wYXJlIHRvIHRoZSBs YXN0IHJhbmdlIHNlbGVjdGlvbgorICAgICAgICBvbiB0aGlzIERhdGFHcmlkTm9kZS4gSWYgdGhl IHZpc2libGUgcG9ydGlvbiBvZiB0aGlzIG5vZGUncyB0aW1lIHJhbmdlCisgICAgICAgIGNoYW5n ZXMsIHdlIG5lZWQgYSByZWZyZXNoLiBPdGhlcndpc2UsIHdlIGRvbid0IG5lZWQgYSByZWZyZXNo LgorCiAyMDE0LTA4LTE1ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogUmVtb3ZlIGZvcmNlZCBsYXlvdXRzIGR1cmluZyByZWNv cmRpbmcgY2F1c2VkIGJ5IHN0cmlwZWQgYmFja2dyb3VuZCBlbGVtZW50IHJlc2l6aW5nCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGll cy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVz LmpzCmluZGV4IGY1NTZhZjEuLjZlMzRlNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCkBAIC0xMDE1LDYgKzEwMTUs MTEgQEAgT2JqZWN0LmRlZmluZVByb3BlcnR5KEFycmF5LnByb3RvdHlwZSwgImJpbmFyeUluZGV4 T2YiLAogICAgIH0KIH0pOwogCitmdW5jdGlvbiBjbGFtcChtaW4sIHZhbHVlLCBtYXgpCit7Cisg ICAgcmV0dXJuIE1hdGgubWluKE1hdGgubWF4KG1pbiwgdmFsdWUpLCBtYXgpOworfQorCiBmdW5j dGlvbiBpbnNlcnRpb25JbmRleEZvck9iamVjdEluTGlzdFNvcnRlZEJ5RnVuY3Rpb24ob2JqZWN0 LCBsaXN0LCBjb21wYXJhdG9yLCBpbnNlcnRpb25JbmRleEFmdGVyKQogewogICAgIGlmIChpbnNl cnRpb25JbmRleEFmdGVyKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvUHJvZmlsZU5vZGUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvUHJvZmlsZU5vZGUuanMKaW5kZXggN2JiMDNlNC4uMjg3YTBi YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxz L1Byb2ZpbGVOb2RlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L01vZGVscy9Qcm9maWxlTm9kZS5qcwpAQCAtOTQsMTMgKzk0LDE1IEBAIFdlYkluc3BlY3Rvci5Q cm9maWxlTm9kZS5wcm90b3R5cGUgPSB7CiAKICAgICBnZXQgc3RhcnRUaW1lKCkKICAgICB7Ci0g ICAgICAgIHRoaXMuX2NvbXB1dGVUb3RhbFRpbWVzSWZOZWVkZWQoKTsKKyAgICAgICAgaWYgKHRo aXMuX3N0YXJ0VGltZSA9PT0gdW5kZWZpbmVkKQorICAgICAgICAgICAgdGhpcy5fc3RhcnRUaW1l ID0gIE1hdGgubWF4KDAsIHRoaXMuX2NhbGxzWzBdLnN0YXJ0VGltZSk7CiAgICAgICAgIHJldHVy biB0aGlzLl9zdGFydFRpbWU7CiAgICAgfSwKIAogICAgIGdldCBlbmRUaW1lKCkKICAgICB7Ci0g ICAgICAgIHRoaXMuX2NvbXB1dGVUb3RhbFRpbWVzSWZOZWVkZWQoKTsKKyAgICAgICAgaWYgKHRo aXMuX2VuZFRpbWUgPT09IHVuZGVmaW5lZCkKKyAgICAgICAgICAgIHRoaXMuX2VuZFRpbWUgPSBN YXRoLm1pbih0aGlzLl9jYWxscy5sYXN0VmFsdWUuZW5kVGltZSwgSW5maW5pdHkpOwogICAgICAg ICByZXR1cm4gdGhpcy5fZW5kVGltZTsKICAgICB9LAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qcm9maWxlTm9kZURhdGFHcmlkTm9kZS5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2ZpbGVOb2Rl RGF0YUdyaWROb2RlLmpzCmluZGV4IGVmNzFlODYuLmE2MDQxYWMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2ZpbGVOb2RlRGF0YUdyaWRO b2RlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1By b2ZpbGVOb2RlRGF0YUdyaWROb2RlLmpzCkBAIC02OCwzNCArNjgsMzkgQEAgV2ViSW5zcGVjdG9y LlByb2ZpbGVOb2RlRGF0YUdyaWROb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRo aXMuX3JhbmdlU3RhcnRUaW1lOwogICAgIH0sCiAKLSAgICBzZXQgcmFuZ2VTdGFydFRpbWUoeCkK LSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9yYW5nZVN0YXJ0VGltZSA9PT0geCkKLSAgICAgICAg ICAgIHJldHVybjsKLQotICAgICAgICB0aGlzLl9yYW5nZVN0YXJ0VGltZSA9IHg7Ci0gICAgICAg IHRoaXMubmVlZHNSZWZyZXNoKCk7Ci0gICAgfSwKLQogICAgIGdldCByYW5nZUVuZFRpbWUoKQog ICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3JhbmdlRW5kVGltZTsKICAgICB9LAogCi0gICAg c2V0IHJhbmdlRW5kVGltZSh4KQotICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3JhbmdlRW5kVGlt ZSA9PT0geCkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICB0aGlzLl9yYW5nZUVuZFRp bWUgPSB4OwotICAgICAgICB0aGlzLm5lZWRzUmVmcmVzaCgpOwotICAgIH0sCi0KICAgICBnZXQg ZGF0YSgpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fZGF0YTsKICAgICB9LAogCisgICAg dXBkYXRlUmFuZ2VUaW1lczogZnVuY3Rpb24oc3RhcnRUaW1lLCBlbmRUaW1lKQorICAgIHsKKyAg ICAgICAgdmFyIG9sZFJhbmdlU3RhcnRUaW1lID0gdGhpcy5fcmFuZ2VTdGFydFRpbWU7CisgICAg ICAgIHZhciBvbGRSYW5nZUVuZFRpbWUgPSB0aGlzLl9yYW5nZUVuZFRpbWU7CisKKyAgICAgICAg aWYgKG9sZFJhbmdlU3RhcnRUaW1lID09PSBzdGFydFRpbWUgJiYgb2xkUmFuZ2VFbmRUaW1lID09 PSBlbmRUaW1lKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHRoaXMuX3JhbmdlU3Rh cnRUaW1lID0gc3RhcnRUaW1lOworICAgICAgICB0aGlzLl9yYW5nZUVuZFRpbWUgPSBlbmRUaW1l OworCisgICAgICAgIC8vIFdlIG9ubHkgbmVlZCBhIHJlZnJlc2ggaWYgdGhlIG5ldyByYW5nZSB0 aW1lIGNoYW5nZXMgdGhlIHZpc2libGUgcG9ydGlvbiBvZiB0aGlzIHJlY29yZC4KKyAgICAgICAg dmFyIHByb2ZpbGVTdGFydCA9IHRoaXMuX3Byb2ZpbGVOb2RlLnN0YXJ0VGltZTsKKyAgICAgICAg dmFyIHByb2ZpbGVFbmQgPSB0aGlzLl9wcm9maWxlTm9kZS5lbmRUaW1lOworICAgICAgICB2YXIg b2xkU3RhcnRCb3VuZGFyeSA9IGNsYW1wKHByb2ZpbGVTdGFydCwgb2xkUmFuZ2VTdGFydFRpbWUs IHByb2ZpbGVFbmQpOworICAgICAgICB2YXIgb2xkRW5kQm91bmRhcnkgPSBjbGFtcChwcm9maWxl U3RhcnQsIG9sZFJhbmdlRW5kVGltZSwgcHJvZmlsZUVuZCk7CisgICAgICAgIHZhciBuZXdTdGFy dEJvdW5kYXJ5ID0gY2xhbXAocHJvZmlsZVN0YXJ0LCBzdGFydFRpbWUsIHByb2ZpbGVFbmQpOwor ICAgICAgICB2YXIgbmV3RW5kQm91bmRhcnkgPSBjbGFtcChwcm9maWxlU3RhcnQsIGVuZFRpbWUs IHByb2ZpbGVFbmQpOworCisgICAgICAgIGlmIChvbGRTdGFydEJvdW5kYXJ5ICE9PSBuZXdTdGFy dEJvdW5kYXJ5IHx8IG9sZEVuZEJvdW5kYXJ5ICE9PSBuZXdFbmRCb3VuZGFyeSkKKyAgICAgICAg ICAgIHRoaXMubmVlZHNSZWZyZXNoKCk7CisgICAgfSwKKwogICAgIHJlZnJlc2g6IGZ1bmN0aW9u KCkKICAgICB7CiAgICAgICAgIHRoaXMuX2RhdGEgPSB0aGlzLl9wcm9maWxlTm9kZS5jb21wdXRl Q2FsbEluZm9Gb3JUaW1lUmFuZ2UodGhpcy5fcmFuZ2VTdGFydFRpbWUsIHRoaXMuX3JhbmdlRW5k VGltZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9TY3JpcHRUaW1lbGluZURhdGFHcmlkTm9kZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lRGF0YUdyaWROb2RlLmpzCmluZGV4 IDRiODhiNDguLmVhOGRiNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lRGF0YUdyaWROb2RlLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lRGF0YUdy aWROb2RlLmpzCkBAIC02MywyOSArNjMsMTEgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5l RGF0YUdyaWROb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3JhbmdlU3Rh cnRUaW1lOwogICAgIH0sCiAKLSAgICBzZXQgcmFuZ2VTdGFydFRpbWUoeCkKLSAgICB7Ci0gICAg ICAgIGlmICh0aGlzLl9yYW5nZVN0YXJ0VGltZSA9PT0geCkKLSAgICAgICAgICAgIHJldHVybjsK LQotICAgICAgICB0aGlzLl9yYW5nZVN0YXJ0VGltZSA9IHg7Ci0gICAgICAgIHRoaXMubmVlZHNS ZWZyZXNoKCk7Ci0gICAgfSwKLQogICAgIGdldCByYW5nZUVuZFRpbWUoKQogICAgIHsKICAgICAg ICAgcmV0dXJuIHRoaXMuX3JhbmdlRW5kVGltZTsKICAgICB9LAogCi0gICAgc2V0IHJhbmdlRW5k VGltZSh4KQotICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3JhbmdlRW5kVGltZSA9PT0geCkKLSAg ICAgICAgICAgIHJldHVybjsKLQotICAgICAgICB0aGlzLl9yYW5nZUVuZFRpbWUgPSB4OwotICAg ICAgICB0aGlzLm5lZWRzUmVmcmVzaCgpOwotICAgIH0sCi0KICAgICBnZXQgZGF0YSgpCiAgICAg ewogICAgICAgICB2YXIgc3RhcnRUaW1lID0gTWF0aC5tYXgodGhpcy5fcmFuZ2VTdGFydFRpbWUs IHRoaXMuX3JlY29yZC5zdGFydFRpbWUpOwpAQCAtOTYsNiArNzgsMzMgQEAgV2ViSW5zcGVjdG9y LlNjcmlwdFRpbWVsaW5lRGF0YUdyaWROb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGF2 ZXJhZ2VUaW1lOiBkdXJhdGlvbiwgY2FsbENvdW50OiAxLCBsb2NhdGlvbjogY2FsbEZyYW1lT3JT b3VyY2VDb2RlTG9jYXRpb259OwogICAgIH0sCiAKKyAgICB1cGRhdGVSYW5nZVRpbWVzOiBmdW5j dGlvbihzdGFydFRpbWUsIGVuZFRpbWUpCisgICAgeworICAgICAgICB2YXIgb2xkUmFuZ2VTdGFy dFRpbWUgPSB0aGlzLl9yYW5nZVN0YXJ0VGltZTsKKyAgICAgICAgdmFyIG9sZFJhbmdlRW5kVGlt ZSA9IHRoaXMuX3JhbmdlRW5kVGltZTsKKworICAgICAgICBpZiAob2xkUmFuZ2VTdGFydFRpbWUg PT09IHN0YXJ0VGltZSAmJiBvbGRSYW5nZUVuZFRpbWUgPT09IGVuZFRpbWUpCisgICAgICAgICAg ICByZXR1cm47CisKKyAgICAgICAgdGhpcy5fcmFuZ2VTdGFydFRpbWUgPSBzdGFydFRpbWU7Cisg ICAgICAgIHRoaXMuX3JhbmdlRW5kVGltZSA9IGVuZFRpbWU7CisgICAgICAgIAorICAgICAgICAv LyBJZiB3ZSBoYXZlIG5vIGR1cmF0aW9uIHRoZSByYW5nZSBkb2VzIG5vdCBtYXR0ZXIuCisgICAg ICAgIGlmICghdGhpcy5fcmVjb3JkLmR1cmF0aW9uKQorICAgICAgICAgICAgcmV0dXJuOworCisg ICAgICAgIC8vIFdlIG9ubHkgbmVlZCBhIHJlZnJlc2ggaWYgdGhlIG5ldyByYW5nZSB0aW1lIGNo YW5nZXMgdGhlIHZpc2libGUgcG9ydGlvbiBvZiB0aGlzIHJlY29yZC4KKyAgICAgICAgdmFyIHJl Y29yZFN0YXJ0ID0gdGhpcy5fcmVjb3JkLnN0YXJ0VGltZTsKKyAgICAgICAgdmFyIHJlY29yZEVu ZCA9IHRoaXMuX3JlY29yZC5zdGFydFRpbWUgKyB0aGlzLl9yZWNvcmQuZHVyYXRpb247CisgICAg ICAgIHZhciBvbGRTdGFydEJvdW5kYXJ5ID0gY2xhbXAocmVjb3JkU3RhcnQsIG9sZFJhbmdlU3Rh cnRUaW1lLCByZWNvcmRFbmQpOworICAgICAgICB2YXIgb2xkRW5kQm91bmRhcnkgPSBjbGFtcChy ZWNvcmRTdGFydCwgb2xkUmFuZ2VFbmRUaW1lLCByZWNvcmRFbmQpOworICAgICAgICB2YXIgbmV3 U3RhcnRCb3VuZGFyeSA9IGNsYW1wKHJlY29yZFN0YXJ0LCBzdGFydFRpbWUsIHJlY29yZEVuZCk7 CisgICAgICAgIHZhciBuZXdFbmRCb3VuZGFyeSA9IGNsYW1wKHJlY29yZFN0YXJ0LCBlbmRUaW1l LCByZWNvcmRFbmQpOworCisgICAgICAgIGlmIChvbGRTdGFydEJvdW5kYXJ5ICE9PSBuZXdTdGFy dEJvdW5kYXJ5IHx8IG9sZEVuZEJvdW5kYXJ5ICE9PSBuZXdFbmRCb3VuZGFyeSkKKyAgICAgICAg ICAgIHRoaXMubmVlZHNSZWZyZXNoKCk7CisgICAgfSwKKwogICAgIGNyZWF0ZUNlbGxDb250ZW50 OiBmdW5jdGlvbihjb2x1bW5JZGVudGlmaWVyLCBjZWxsKQogICAgIHsKICAgICAgICAgY29uc3Qg ZW1wdHlWYWx1ZVBsYWNlaG9sZGVyU3RyaW5nID0gIlx1MjAxNCI7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1lbGluZVZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1l bGluZVZpZXcuanMKaW5kZXggZjhkNjljZS4uZTY4NmRhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VGltZWxpbmVWaWV3LmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVs aW5lVmlldy5qcwpAQCAtMTEyLDggKzExMiw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGlu ZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5zdGFydFRpbWUgIT09IHRoaXMu X29sZFN0YXJ0VGltZSB8fCB0aGlzLmVuZFRpbWUgIT09IHRoaXMuX29sZEVuZFRpbWUpIHsKICAg ICAgICAgICAgIHZhciBkYXRhR3JpZE5vZGUgPSB0aGlzLl9kYXRhR3JpZC5jaGlsZHJlblswXTsK ICAgICAgICAgICAgIHdoaWxlIChkYXRhR3JpZE5vZGUpIHsKLSAgICAgICAgICAgICAgICBkYXRh R3JpZE5vZGUucmFuZ2VTdGFydFRpbWUgPSB0aGlzLnN0YXJ0VGltZTsKLSAgICAgICAgICAgICAg ICBkYXRhR3JpZE5vZGUucmFuZ2VFbmRUaW1lID0gdGhpcy5lbmRUaW1lOworICAgICAgICAgICAg ICAgIGRhdGFHcmlkTm9kZS51cGRhdGVSYW5nZVRpbWVzKHRoaXMuc3RhcnRUaW1lLCB0aGlzLmVu ZFRpbWUpOwogICAgICAgICAgICAgICAgIGlmIChkYXRhR3JpZE5vZGUucmV2ZWFsZWQpCiAgICAg ICAgICAgICAgICAgICAgIGRhdGFHcmlkTm9kZS5yZWZyZXNoSWZOZWVkZWQoKTsKICAgICAgICAg ICAgICAgICBkYXRhR3JpZE5vZGUgPSBkYXRhR3JpZE5vZGUudHJhdmVyc2VOZXh0Tm9kZShmYWxz ZSwgbnVsbCwgdHJ1ZSk7Cg==