151071 2015-11-09 17:17:28 -0800 Web Inspector: Support Gesture Events to zoom in / out of the Timeline 2015-11-16 10:43:11 -0800 1 1 1 Unclassified WebKit Web Inspector Other All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev thorton timothy webkit-bug-importer oldest_to_newest 1140629 0 joepeck 2015-11-09 17:17:28 -0800 * SUMMARY Support Gesture Events to zoom in / out of the Timeline. Use the gesture event's scale property to scale the secondsPerPixel value. Center like MouseWheel events around the mouse position. * NOTES - This still pins to the edge if an edge is available for both mouse wheel and now gesture events. That feels funny, we should make any zoom IN unpin from the edge and just zoom in where the mouse is. Handle this separately. 1140630 1 webkit-bug-importer 2015-11-09 17:17:46 -0800 <rdar://problem/23474383> 1140631 2 265125 joepeck 2015-11-09 17:18:43 -0800 Created attachment 265125 [PATCH] Proposed Fix 1140634 3 joepeck 2015-11-09 17:20:27 -0800 *** Bug 151061 has been marked as a duplicate of this bug. *** 1140646 4 265125 mattbaker 2015-11-09 17:52:44 -0800 Comment on attachment 265125 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=265125&action=review > Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js:494 > + let newSecondsPerPixel = this._gestureStartDurationPerPixel * (1 / scale); let newSecondsPerPixel = this._gestureStartDurationPerPixel / scale; 1140669 5 265139 joepeck 2015-11-09 19:42:40 -0800 Created attachment 265139 [PATCH] For Landing 1140670 6 joepeck 2015-11-09 19:43:49 -0800 (In reply to comment #4) > Comment on attachment 265125 [details] > [PATCH] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=265125&action=review > > > Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js:494 > > + let newSecondsPerPixel = this._gestureStartDurationPerPixel * (1 / scale); > > let newSecondsPerPixel = this._gestureStartDurationPerPixel / scale; Heh, yeah. I think this is a bit harder to reason about when you read the line of code. In any case, I made this change. 1140676 7 265139 commit-queue 2015-11-09 20:39:22 -0800 Comment on attachment 265139 [PATCH] For Landing Clearing flags on attachment: 265139 Committed r192198: <http://trac.webkit.org/changeset/192198> 1140757 8 265125 bburg 2015-11-10 06:46:00 -0800 Comment on attachment 265125 [PATCH] Proposed Fix Clearing stale cq? flag. 1140760 9 265139 bburg 2015-11-10 06:50:39 -0800 Comment on attachment 265139 [PATCH] For Landing View in context: https://bugs.webkit.org/attachment.cgi?id=265139&action=review > Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js:429 > + // Ignore wheel events while handing gestures. Nit: handling 265125 2015-11-09 17:18:43 -0800 2015-11-10 06:46:00 -0800 [PATCH] Proposed Fix gesture-events.patch text/plain 4205 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ2NjJiMTQuLjA1OGIzY2IgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTExLTA5ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogU3VwcG9y dCBHZXN0dXJlIEV2ZW50cyB0byB6b29tIGluIC8gb3V0IG9mIHRoZSBUaW1lbGluZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxMDcxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRqdXN0IHRoZSBUaW1l bGluZSdzIHNlY29uZHNQZXJQaXhlbCB2YWx1ZSBieSB0aGUgZ2VzdHVyZSBldmVudCdzIHNjYWxl IGZhY3Rvci4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmll dy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlwZS5faGFuZGxlV2hlZWxFdmVu dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5faGFuZGxlR2VzdHVy ZVN0YXJ0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlw ZS5faGFuZGxlR2VzdHVyZUNoYW5nZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVP dmVydmlldy5wcm90b3R5cGUuX2hhbmRsZUdlc3R1cmVFbmQpOgorCiAyMDE1LTExLTA5ICBOaWtp dGEgVmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtSZWdyZXNzaW9uXSBbTWF2ZXJpY2tzXSBUb3AgYm9yZGVyIG9mIHNlbGVjdGVkIHRhYiBt YXRjaGVzIHRoZSBiYWNrZ3JvdW5kIHdoZW4gV2ViIEluc3BlY3RvciBpcyB1bmRvY2tlZApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxp bmVPdmVydmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lT3ZlcnZpZXcuanMKaW5kZXggZDVlZTFiYy4uZmNmNjQzNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmll dy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1l bGluZU92ZXJ2aWV3LmpzCkBAIC0zOCw2ICszOCw5IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92 ZXJ2aWV3ID0gY2xhc3MgVGltZWxpbmVPdmVydmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmpl CiAgICAgICAgIHRoaXMuX2VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsK ICAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJ0aW1lbGluZS1vdmVydmlldyIs IGlkZW50aWZpZXIpOwogICAgICAgICB0aGlzLl9lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIndo ZWVsIiwgdGhpcy5faGFuZGxlV2hlZWxFdmVudC5iaW5kKHRoaXMpKTsKKyAgICAgICAgdGhpcy5f ZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJnZXN0dXJlc3RhcnQiLCB0aGlzLl9oYW5kbGVHZXN0 dXJlU3RhcnQuYmluZCh0aGlzKSk7CisgICAgICAgIHRoaXMuX2VsZW1lbnQuYWRkRXZlbnRMaXN0 ZW5lcigiZ2VzdHVyZWNoYW5nZSIsIHRoaXMuX2hhbmRsZUdlc3R1cmVDaGFuZ2UuYmluZCh0aGlz KSk7CisgICAgICAgIHRoaXMuX2VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiZ2VzdHVyZWVuZCIs IHRoaXMuX2hhbmRsZUdlc3R1cmVFbmQuYmluZCh0aGlzKSk7CiAKICAgICAgICAgdGhpcy5fZ3Jh cGhzQ29udGFpbmVyRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAg ICAgICB0aGlzLl9ncmFwaHNDb250YWluZXJFbGVtZW50LmNsYXNzTGlzdC5hZGQoImdyYXBocy1j b250YWluZXIiKTsKQEAgLTQyMyw2ICs0MjYsMTAgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3Zl cnZpZXcgPSBjbGFzcyBUaW1lbGluZU92ZXJ2aWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamUK ICAgICAgICAgaWYgKGV2ZW50Ll9fY2xvbmVkKQogICAgICAgICAgICAgcmV0dXJuOwogCisgICAg ICAgIC8vIElnbm9yZSB3aGVlbCBldmVudHMgd2hpbGUgaGFuZGluZyBnZXN0dXJlcy4KKyAgICAg ICAgaWYgKHRoaXMuX2hhbmRsaW5nR2VzdHVyZSkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAg ICAgICAvLyBSZXF1aXJlIHR3aWNlIHRoZSB2ZXJ0aWNhbCBkZWx0YSB0byBvdmVyY29tZSBob3Jp em9udGFsIHNjcm9sbGluZy4gVGhpcyBwcmV2ZW50cyBtb3N0CiAgICAgICAgIC8vIGNhc2VzIG9m IGluYWR2ZXJ0ZW50IHpvb21pbmcgZm9yIHNsaWdodGx5IGRpYWdvbmFsIHNjcm9sbHMuCiAgICAg ICAgIGlmIChNYXRoLmFicyhldmVudC5kZWx0YVgpID49IE1hdGguYWJzKGV2ZW50LmRlbHRhWSkg KiAwLjUpIHsKQEAgLTQ2MCw2ICs0NjcsNDYgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZp ZXcgPSBjbGFzcyBUaW1lbGluZU92ZXJ2aWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamUKICAg ICAgICAgZXZlbnQuc3RvcFByb3BhZ2F0aW9uKCk7CiAgICAgfQogCisgICAgX2hhbmRsZUdlc3R1 cmVTdGFydChldmVudCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9oYW5kbGluZ0dlc3R1cmUp IHsKKyAgICAgICAgICAgIC8vIEZJWE1FOiA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTUxMDY4PiBb TWFjXSBVbmV4cGVjdGVkIGdlc3R1cmVzdGFydCBldmVudHMgd2hlbiBhbHJlYWR5IGhhbmRsaW5n IGdlc3R1cmUKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGxldCBt b3VzZU9mZnNldCA9IGV2ZW50LnBhZ2VYIC0gdGhpcy5fZWxlbWVudC50b3RhbE9mZnNldExlZnQ7 CisgICAgICAgIGxldCBtb3VzZVBvc2l0aW9uVGltZSA9IHRoaXMuX3Njcm9sbFN0YXJ0VGltZSAr IChtb3VzZU9mZnNldCAqIHRoaXMuX2R1cmF0aW9uUGVyUGl4ZWwpOworCisgICAgICAgIHRoaXMu X2hhbmRsaW5nR2VzdHVyZSA9IHRydWU7CisgICAgICAgIHRoaXMuX2dlc3R1cmVTdGFydFN0YXJ0 VGltZSA9IG1vdXNlUG9zaXRpb25UaW1lOworICAgICAgICB0aGlzLl9nZXN0dXJlU3RhcnREdXJh dGlvblBlclBpeGVsID0gdGhpcy5fZHVyYXRpb25QZXJQaXhlbDsKKworICAgICAgICBldmVudC5w cmV2ZW50RGVmYXVsdCgpOworICAgICAgICBldmVudC5zdG9wUHJvcGFnYXRpb24oKTsKKyAgICB9 CisKKyAgICBfaGFuZGxlR2VzdHVyZUNoYW5nZShldmVudCkKKyAgICB7CisgICAgICAgIC8vIENh cCB6b29taW5nIG91dCBhdCA1eC4KKyAgICAgICAgbGV0IHNjYWxlID0gTWF0aC5tYXgoMS81LCBl dmVudC5zY2FsZSk7CisKKyAgICAgICAgbGV0IG1vdXNlT2Zmc2V0ID0gZXZlbnQucGFnZVggLSB0 aGlzLl9lbGVtZW50LnRvdGFsT2Zmc2V0TGVmdDsKKyAgICAgICAgbGV0IG5ld1NlY29uZHNQZXJQ aXhlbCA9IHRoaXMuX2dlc3R1cmVTdGFydER1cmF0aW9uUGVyUGl4ZWwgKiAoMSAvIHNjYWxlKTsK KworICAgICAgICB0aGlzLnNlY29uZHNQZXJQaXhlbCA9IG5ld1NlY29uZHNQZXJQaXhlbDsKKyAg ICAgICAgdGhpcy5zY3JvbGxTdGFydFRpbWUgPSB0aGlzLl9nZXN0dXJlU3RhcnRTdGFydFRpbWUg LSAobW91c2VPZmZzZXQgKiB0aGlzLl9kdXJhdGlvblBlclBpeGVsKTsKKworICAgICAgICBldmVu dC5wcmV2ZW50RGVmYXVsdCgpOworICAgICAgICBldmVudC5zdG9wUHJvcGFnYXRpb24oKTsKKyAg ICB9CisKKyAgICBfaGFuZGxlR2VzdHVyZUVuZChldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMu X2hhbmRsaW5nR2VzdHVyZSA9IGZhbHNlOworICAgICAgICB0aGlzLl9nZXN0dXJlU3RhcnRTdGFy dFRpbWUgPSBOYU47CisgICAgICAgIHRoaXMuX2dlc3R1cmVTdGFydER1cmF0aW9uUGVyUGl4ZWwg PSBOYU47CisgICAgfQorCiAgICAgX3RpbWVsaW5lQWRkZWQodGltZWxpbmVPckV2ZW50KQogICAg IHsKICAgICAgICAgdmFyIHRpbWVsaW5lID0gdGltZWxpbmVPckV2ZW50Owo= 265139 2015-11-09 19:42:40 -0800 2015-11-09 20:39:22 -0800 [PATCH] For Landing for-landing.patch text/plain 4200 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ2NjJiMTQuLmU4OGI4ODEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTExLTA5ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogU3VwcG9y dCBHZXN0dXJlIEV2ZW50cyB0byB6b29tIGluIC8gb3V0IG9mIHRoZSBUaW1lbGluZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxMDcxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgorCisgICAgICAgIEFkanVzdCB0aGUgVGlt ZWxpbmUncyBzZWNvbmRzUGVyUGl4ZWwgdmFsdWUgYnkgdGhlIGdlc3R1cmUgZXZlbnQncyBzY2Fs ZSBmYWN0b3IuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZp ZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldyk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUuX2hhbmRsZVdoZWVsRXZl bnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcuX2hhbmRsZUdlc3R1 cmVTdGFydCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90b3R5 cGUuX2hhbmRsZUdlc3R1cmVDaGFuZ2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5l T3ZlcnZpZXcucHJvdG90eXBlLl9oYW5kbGVHZXN0dXJlRW5kKToKKwogMjAxNS0xMS0wOSAgTmlr aXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiBbUmVncmVzc2lvbl0gW01hdmVyaWNrc10gVG9wIGJvcmRlciBvZiBzZWxlY3RlZCB0YWIg bWF0Y2hlcyB0aGUgYmFja2dyb3VuZCB3aGVuIFdlYiBJbnNwZWN0b3IgaXMgdW5kb2NrZWQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVs aW5lT3ZlcnZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZU92ZXJ2aWV3LmpzCmluZGV4IGQ1ZWUxYmMuLmNiOTcwYTMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZp ZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGlt ZWxpbmVPdmVydmlldy5qcwpAQCAtMzgsNiArMzgsOSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVP dmVydmlldyA9IGNsYXNzIFRpbWVsaW5lT3ZlcnZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2Jq ZQogICAgICAgICB0aGlzLl9lbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7 CiAgICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LmFkZCgidGltZWxpbmUtb3ZlcnZpZXci LCBpZGVudGlmaWVyKTsKICAgICAgICAgdGhpcy5fZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJ3 aGVlbCIsIHRoaXMuX2hhbmRsZVdoZWVsRXZlbnQuYmluZCh0aGlzKSk7CisgICAgICAgIHRoaXMu X2VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiZ2VzdHVyZXN0YXJ0IiwgdGhpcy5faGFuZGxlR2Vz dHVyZVN0YXJ0LmJpbmQodGhpcykpOworICAgICAgICB0aGlzLl9lbGVtZW50LmFkZEV2ZW50TGlz dGVuZXIoImdlc3R1cmVjaGFuZ2UiLCB0aGlzLl9oYW5kbGVHZXN0dXJlQ2hhbmdlLmJpbmQodGhp cykpOworICAgICAgICB0aGlzLl9lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImdlc3R1cmVlbmQi LCB0aGlzLl9oYW5kbGVHZXN0dXJlRW5kLmJpbmQodGhpcykpOwogCiAgICAgICAgIHRoaXMuX2dy YXBoc0NvbnRhaW5lckVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAg ICAgICAgdGhpcy5fZ3JhcGhzQ29udGFpbmVyRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJncmFwaHMt Y29udGFpbmVyIik7CkBAIC00MjMsNiArNDI2LDEwIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92 ZXJ2aWV3ID0gY2xhc3MgVGltZWxpbmVPdmVydmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmpl CiAgICAgICAgIGlmIChldmVudC5fX2Nsb25lZCkKICAgICAgICAgICAgIHJldHVybjsKIAorICAg ICAgICAvLyBJZ25vcmUgd2hlZWwgZXZlbnRzIHdoaWxlIGhhbmRpbmcgZ2VzdHVyZXMuCisgICAg ICAgIGlmICh0aGlzLl9oYW5kbGluZ0dlc3R1cmUpCisgICAgICAgICAgICByZXR1cm47CisKICAg ICAgICAgLy8gUmVxdWlyZSB0d2ljZSB0aGUgdmVydGljYWwgZGVsdGEgdG8gb3ZlcmNvbWUgaG9y aXpvbnRhbCBzY3JvbGxpbmcuIFRoaXMgcHJldmVudHMgbW9zdAogICAgICAgICAvLyBjYXNlcyBv ZiBpbmFkdmVydGVudCB6b29taW5nIGZvciBzbGlnaHRseSBkaWFnb25hbCBzY3JvbGxzLgogICAg ICAgICBpZiAoTWF0aC5hYnMoZXZlbnQuZGVsdGFYKSA+PSBNYXRoLmFicyhldmVudC5kZWx0YVkp ICogMC41KSB7CkBAIC00NjAsNiArNDY3LDQ2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2 aWV3ID0gY2xhc3MgVGltZWxpbmVPdmVydmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplCiAg ICAgICAgIGV2ZW50LnN0b3BQcm9wYWdhdGlvbigpOwogICAgIH0KIAorICAgIF9oYW5kbGVHZXN0 dXJlU3RhcnQoZXZlbnQpCisgICAgeworICAgICAgICBpZiAodGhpcy5faGFuZGxpbmdHZXN0dXJl KSB7CisgICAgICAgICAgICAvLyBGSVhNRTogPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE1MTA2OD4g W01hY10gVW5leHBlY3RlZCBnZXN0dXJlc3RhcnQgZXZlbnRzIHdoZW4gYWxyZWFkeSBoYW5kbGlu ZyBnZXN0dXJlCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBsZXQg bW91c2VPZmZzZXQgPSBldmVudC5wYWdlWCAtIHRoaXMuX2VsZW1lbnQudG90YWxPZmZzZXRMZWZ0 OworICAgICAgICBsZXQgbW91c2VQb3NpdGlvblRpbWUgPSB0aGlzLl9zY3JvbGxTdGFydFRpbWUg KyAobW91c2VPZmZzZXQgKiB0aGlzLl9kdXJhdGlvblBlclBpeGVsKTsKKworICAgICAgICB0aGlz Ll9oYW5kbGluZ0dlc3R1cmUgPSB0cnVlOworICAgICAgICB0aGlzLl9nZXN0dXJlU3RhcnRTdGFy dFRpbWUgPSBtb3VzZVBvc2l0aW9uVGltZTsKKyAgICAgICAgdGhpcy5fZ2VzdHVyZVN0YXJ0RHVy YXRpb25QZXJQaXhlbCA9IHRoaXMuX2R1cmF0aW9uUGVyUGl4ZWw7CisKKyAgICAgICAgZXZlbnQu cHJldmVudERlZmF1bHQoKTsKKyAgICAgICAgZXZlbnQuc3RvcFByb3BhZ2F0aW9uKCk7CisgICAg fQorCisgICAgX2hhbmRsZUdlc3R1cmVDaGFuZ2UoZXZlbnQpCisgICAgeworICAgICAgICAvLyBD YXAgem9vbWluZyBvdXQgYXQgNXguCisgICAgICAgIGxldCBzY2FsZSA9IE1hdGgubWF4KDEvNSwg ZXZlbnQuc2NhbGUpOworCisgICAgICAgIGxldCBtb3VzZU9mZnNldCA9IGV2ZW50LnBhZ2VYIC0g dGhpcy5fZWxlbWVudC50b3RhbE9mZnNldExlZnQ7CisgICAgICAgIGxldCBuZXdTZWNvbmRzUGVy UGl4ZWwgPSB0aGlzLl9nZXN0dXJlU3RhcnREdXJhdGlvblBlclBpeGVsIC8gc2NhbGU7CisKKyAg ICAgICAgdGhpcy5zZWNvbmRzUGVyUGl4ZWwgPSBuZXdTZWNvbmRzUGVyUGl4ZWw7CisgICAgICAg IHRoaXMuc2Nyb2xsU3RhcnRUaW1lID0gdGhpcy5fZ2VzdHVyZVN0YXJ0U3RhcnRUaW1lIC0gKG1v dXNlT2Zmc2V0ICogdGhpcy5fZHVyYXRpb25QZXJQaXhlbCk7CisKKyAgICAgICAgZXZlbnQucHJl dmVudERlZmF1bHQoKTsKKyAgICAgICAgZXZlbnQuc3RvcFByb3BhZ2F0aW9uKCk7CisgICAgfQor CisgICAgX2hhbmRsZUdlc3R1cmVFbmQoZXZlbnQpCisgICAgeworICAgICAgICB0aGlzLl9oYW5k bGluZ0dlc3R1cmUgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5fZ2VzdHVyZVN0YXJ0U3RhcnRUaW1l ID0gTmFOOworICAgICAgICB0aGlzLl9nZXN0dXJlU3RhcnREdXJhdGlvblBlclBpeGVsID0gTmFO OworICAgIH0KKwogICAgIF90aW1lbGluZUFkZGVkKHRpbWVsaW5lT3JFdmVudCkKICAgICB7CiAg ICAgICAgIHZhciB0aW1lbGluZSA9IHRpbWVsaW5lT3JFdmVudDsK