151374 2015-11-17 17:17:06 -0800 Web Inspector: Update Timeline UI based on the Instruments in the Active Recording 2015-12-01 13:56:36 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1142722 0 joepeck 2015-11-17 17:17:06 -0800 * SUMMARY Update Timeline UI based on the Instruments in the Active Recording. Dynamically update the Timeline UI based on the Instruments in the Active Recording. - load a new Timeline with Network/Layout instruments => TimelineOverview should have 2 rows and not offer RenderingFrames view of time (basic toolbar) - load a new Timeline with Network/Layout/Scripts/FPS instruments => TimelineOverview should have 3 rows, and offer RenderingFrames view of time (toggle toolbar) There isn't yet UI to change the instruments used by Timelines, but this ensures the UI updates properly. 1142723 1 webkit-bug-importer 2015-11-17 17:17:41 -0800 <rdar://problem/23586487> 1142725 2 265720 joepeck 2015-11-17 17:22:06 -0800 Created attachment 265720 [PATCH] Proposed Fix I don't expect this to build, it relies on earlier patches. 1143088 3 265720 bburg 2015-11-18 16:54:24 -0800 Comment on attachment 265720 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=265720&action=review r=me > Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js:841 > + const timelineHeight = 36; FIXME: this will (hopefully) (eventually) be dynamically resizable per timeline. Important once we have graphs and not pills. 1145381 4 joepeck 2015-12-01 13:56:36 -0800 <http://trac.webkit.org/changeset/192907> 265720 2015-11-17 17:22:06 -0800 2015-11-18 16:54:24 -0800 [PATCH] Proposed Fix multiple-instruments.patch text/plain 14640 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGVkNzE5MDAuLmE3MzRkMGYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQxIEBACiAyMDE1LTExLTE3ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVXBkYXRl IFRpbWVsaW5lIFVJIGJhc2VkIG9uIHRoZSBJbnN0cnVtZW50cyBpbiB0aGUgQWN0aXZlIFJlY29y ZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUx Mzc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUu X3VwZGF0ZVRpbWVsaW5lT3ZlcnZpZXdIZWlnaHQpOgorICAgICAgICBNb2Rlcm5pemUgYXMgSSB3 YXMgaW4gdGhpcyBjb2RlIHdoaWxlIGxvb2tpbmcgaW50byB0aGlzIHBhdGNoLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5jc3M6CisgICAgICAg ICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnRpbWVsaW5lID4gLnRpdGxlLWJhci50aW1l bGluZS1ldmVudHMpOiBEZWxldGVkLgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdh dGlvbi50aW1lbGluZSA+IC50aW1lbGluZXMtY29udGVudCk6IERlbGV0ZWQuCisgICAgICAgIFRo ZXNlIGRlZmF1bHRzIGFyZSBubyBsb25nZXIgbmVjZXNzYXJ5LCB0aGUgVUkgb3ZlcnJpZGVzIHRo ZW0gYW55d2F5cy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRl YmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwp OgorICAgICAgICBJbmNsdWRlIGJvdGggdGhlIGJhc2ljIGFuZCByZW5kZXJpbmcgZnJhbWVzIHRv b2xiYXJzLiBUaGV5IHdpbGwgYmUKKyAgICAgICAgbXV0dWFsbHkgZXhjbHVzaXZlIGJhc2VkIG9u IGlmIHRoZSBGUFNJbnRydW1lbnQgaXMgYXZhaWxhYmxlLgorCisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9yZWNvcmRpbmdTZWxlY3RlZCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9jbGVh ckluc3RydW1lbnRzKToKKyAgICAgICAgV2hlbiBsb2FkaW5nIGEgbmV3IFJlY29yZGluZyBjbGVh ciB0aGUgVUkuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5w cm90b3R5cGUuX2luc3RydW1lbnRBZGRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxp bmVTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9pbnN0cnVtZW50UmVtb3ZlZCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9hZGRlZEZQU0luc3Ry dW1lbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLnByb3Rv dHlwZS5fcmVtb3ZlZEZQU0luc3RydW1lbnQpOgorICAgICAgICBIYW5kbGUgdG9nZ2xpbmcgdGhl IHRvb2xiYXJzIHdoZW4gdGhlIEZQUyBpbnN0cnVtZW50IGlzIGFkZGVkL3JlbW92ZWQuCisKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5wcm90b3R5cGUuX3RpbWVs aW5lQ291bnRDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQ YW5lbC5wcm90b3R5cGUuX3VwZGF0ZVRpbWVsaW5lT3ZlcnZpZXdIZWlnaHQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fY2hhbmdlVmlld01v ZGUpOgorICAgICAgICBQcm9wZXJseSB1cGRhdGUgdGhlIHNpZGViYXIncyB1bmRlcnN0YW5kaW5n IG9mIHRoZSBUaW1lbGluZU92ZXJ2aWV3IHNpemUuCisKKzIwMTUtMTEtMTcgIEpvc2VwaCBQZWNv cmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbml0 aWFsIHN1cHBvcnQgZm9yIHZhcmlhYmxlIHRpbWVsaW5lcwogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxMzcyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVu dFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1l bGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzCmluZGV4IDQ2ZTFkMTIuLjQ5MmEyMTMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5l UmVjb3JkaW5nQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qcwpAQCAtNTU2LDIz ICs1NTYsMjIgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcgPSBj bGFzcyBUaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3IGUKIAogICAgIF91cGRhdGVUaW1lbGlu ZU92ZXJ2aWV3SGVpZ2h0KCkKICAgICB7CisgICAgICAgIGNvbnN0IHJ1bGVySGVpZ2h0ID0gMjk7 CiAgICAgICAgIGNvbnN0IHRpbWVsaW5lSGVpZ2h0ID0gMzY7CiAgICAgICAgIGNvbnN0IHJlbmRl cmluZ0ZyYW1lc1RpbWVsaW5lSGVpZ2h0ID0gMTA4OwotICAgICAgICBjb25zdCBydWxlckhlaWdo dCA9IDI5OwotCi0gICAgICAgIHZhciBvdmVydmlld0hlaWdodDsKIAorICAgICAgICBsZXQgb3Zl cnZpZXdIZWlnaHQ7CiAgICAgICAgIGlmICh0aGlzLmN1cnJlbnRUaW1lbGluZVZpZXcgJiYgdGhp cy5jdXJyZW50VGltZWxpbmVWaWV3LnJlcHJlc2VudGVkT2JqZWN0LnR5cGUgPT09IFdlYkluc3Bl Y3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLlJlbmRlcmluZ0ZyYW1lKQogICAgICAgICAgICAgb3Zl cnZpZXdIZWlnaHQgPSByZW5kZXJpbmdGcmFtZXNUaW1lbGluZUhlaWdodDsKICAgICAgICAgZWxz ZSB7Ci0gICAgICAgICAgICB2YXIgdGltZWxpbmVDb3VudCA9IHRoaXMuX3RpbWVsaW5lVmlld01h cC5zaXplOworICAgICAgICAgICAgbGV0IHRpbWVsaW5lQ291bnQgPSB0aGlzLl90aW1lbGluZVZp ZXdNYXAuc2l6ZTsKICAgICAgICAgICAgIGlmICh0aGlzLl9yZW5kZXJpbmdGcmFtZVRpbWVsaW5l KQogICAgICAgICAgICAgICAgIHRpbWVsaW5lQ291bnQtLTsKIAogICAgICAgICAgICAgb3ZlcnZp ZXdIZWlnaHQgPSB0aW1lbGluZUNvdW50ICogdGltZWxpbmVIZWlnaHQ7CiAgICAgICAgIH0KIAot ICAgICAgICB2YXIgc3R5bGVWYWx1ZSA9IChydWxlckhlaWdodCArIG92ZXJ2aWV3SGVpZ2h0KSAr ICJweCI7CisgICAgICAgIGxldCBzdHlsZVZhbHVlID0gKG92ZXJ2aWV3SGVpZ2h0ICsgcnVsZXJI ZWlnaHQpICsgInB4IjsKICAgICAgICAgdGhpcy5fY3VycmVudFRpbWVsaW5lT3ZlcnZpZXcuZWxl bWVudC5zdHlsZS5oZWlnaHQgPSBzdHlsZVZhbHVlOwogICAgICAgICB0aGlzLl9jb250ZW50Vmll d0NvbnRhaW5lci5lbGVtZW50LnN0eWxlLnRvcCA9IHN0eWxlVmFsdWU7CiAgICAgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVT aWRlYmFyUGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVGltZWxpbmVTaWRlYmFyUGFuZWwuY3NzCmluZGV4IGE2NTNlMzYuLjJlOWMxYTUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5l U2lkZWJhclBhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5jc3MKQEAgLTE0NCw3ICsxNDQsNiBAQCBib2R5 LndpbmRvdy1pbmFjdGl2ZSAuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnRpbWVsaW5lID4g LnRpdGxlLWJhciB7CiAgICAgZGlzcGxheTogZmxleDsKICAgICBoZWlnaHQ6IDIzcHg7CiAgICAg Ym9yZGVyLXRvcDogMXB4IHNvbGlkIGhzbCgwLCAwJSwgNzAlKTsKLSAgICB0b3A6IDE2NnB4Owog fQogCiAuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnRpbWVsaW5lID4gLnRpdGxlLWJhci50 aW1lbGluZS1ldmVudHMgPiAudGl0bGUtYmFyLXNjb3BlLWJhciB7CkBAIC0xNzAsNyArMTY5LDYg QEAgYm9keS53aW5kb3ctaW5hY3RpdmUgLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi50aW1l bGluZSA+IC50aXRsZS1iYXIudGltZWxpbmUKIC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24u dGltZWxpbmUgPiAudGltZWxpbmVzLWNvbnRlbnQgewogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsK ICAgICB0b3A6IDU4cHg7Ci0gICAgaGVpZ2h0OiAxMDhweDsKICAgICBsZWZ0OiAwOwogICAgIHJp Z2h0OiAwOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lU2lkZWJhclBhbmVsLmpzCmluZGV4IDM3Yjc0NGEu LmEyNzI2ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1RpbWVsaW5lU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lU2lkZWJhclBhbmVsLmpzCkBAIC0zMSwxOSAr MzEsMTkgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsID0gY2xhc3MgVGltZWxp bmVTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbnNwZWMKIAogICAgICAgICB0aGlzLmNvbnRlbnRC cm93c2VyID0gY29udGVudEJyb3dzZXI7CiAKLSAgICAgICAgdmFyIHRpbWVsaW5lRXZlbnRzVGl0 bGVCYXJDb250YWluZXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAg dGltZWxpbmVFdmVudHNUaXRsZUJhckNvbnRhaW5lci5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rv ci5UaW1lbGluZVNpZGViYXJQYW5lbC5UaXRsZUJhclN0eWxlQ2xhc3MpOwotICAgICAgICB0aW1l bGluZUV2ZW50c1RpdGxlQmFyQ29udGFpbmVyLmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLlRp bWVsaW5lU2lkZWJhclBhbmVsLlRpbWVsaW5lRXZlbnRzVGl0bGVCYXJTdHlsZUNsYXNzKTsKKyAg ICAgICAgdGhpcy5fdGltZWxpbmVFdmVudHNUaXRsZUJhckNvbnRhaW5lciA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImRpdiIpOworICAgICAgICB0aGlzLl90aW1lbGluZUV2ZW50c1RpdGxlQmFy Q29udGFpbmVyLmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVs LlRpdGxlQmFyU3R5bGVDbGFzcyk7CisgICAgICAgIHRoaXMuX3RpbWVsaW5lRXZlbnRzVGl0bGVC YXJDb250YWluZXIuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFu ZWwuVGltZWxpbmVFdmVudHNUaXRsZUJhclN0eWxlQ2xhc3MpOwogCiAgICAgICAgIHRoaXMuX3Rp bWVsaW5lRXZlbnRzVGl0bGVCYXJFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2 Iik7CiAgICAgICAgIHRoaXMuX3RpbWVsaW5lRXZlbnRzVGl0bGVCYXJFbGVtZW50LmNsYXNzTGlz dC5hZGQoV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLlRpdGxlQmFyVGV4dFN0eWxl Q2xhc3MpOwotICAgICAgICB0aW1lbGluZUV2ZW50c1RpdGxlQmFyQ29udGFpbmVyLmFwcGVuZENo aWxkKHRoaXMuX3RpbWVsaW5lRXZlbnRzVGl0bGVCYXJFbGVtZW50KTsKKyAgICAgICAgdGhpcy5f dGltZWxpbmVFdmVudHNUaXRsZUJhckNvbnRhaW5lci5hcHBlbmRDaGlsZCh0aGlzLl90aW1lbGlu ZUV2ZW50c1RpdGxlQmFyRWxlbWVudCk7CiAKICAgICAgICAgdGhpcy5fdGltZWxpbmVFdmVudHNU aXRsZUJhclNjb3BlQ29udGFpbmVyID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAg ICAgICAgIHRoaXMuX3RpbWVsaW5lRXZlbnRzVGl0bGVCYXJTY29wZUNvbnRhaW5lci5jbGFzc0xp c3QuYWRkKFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5UaXRsZUJhclNjb3BlQmFy U3R5bGVDbGFzcyk7Ci0gICAgICAgIHRpbWVsaW5lRXZlbnRzVGl0bGVCYXJDb250YWluZXIuYXBw ZW5kQ2hpbGQodGhpcy5fdGltZWxpbmVFdmVudHNUaXRsZUJhclNjb3BlQ29udGFpbmVyKTsKKyAg ICAgICAgdGhpcy5fdGltZWxpbmVFdmVudHNUaXRsZUJhckNvbnRhaW5lci5hcHBlbmRDaGlsZCh0 aGlzLl90aW1lbGluZUV2ZW50c1RpdGxlQmFyU2NvcGVDb250YWluZXIpOwogCi0gICAgICAgIHRo aXMuZWxlbWVudC5pbnNlcnRCZWZvcmUodGltZWxpbmVFdmVudHNUaXRsZUJhckNvbnRhaW5lciwg dGhpcy5lbGVtZW50LmZpcnN0Q2hpbGQpOworICAgICAgICB0aGlzLmVsZW1lbnQuaW5zZXJ0QmVm b3JlKHRoaXMuX3RpbWVsaW5lRXZlbnRzVGl0bGVCYXJDb250YWluZXIsIHRoaXMuZWxlbWVudC5m aXJzdENoaWxkKTsKIAogICAgICAgICB0aGlzLmNvbnRlbnRUcmVlT3V0bGluZUxhYmVsID0gIiI7 CiAKQEAgLTczLDE2ICs3MywyMyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwg PSBjbGFzcyBUaW1lbGluZVNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3BlYwogCiAgICAgICAg IHRoaXMuX3RpbWVsaW5lVHJlZUVsZW1lbnRNYXAgPSBuZXcgTWFwOwogCisgICAgICAgIHRoaXMu X2Jhc2ljVGl0bGVCYXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICAgICAg dGhpcy5fYmFzaWNUaXRsZUJhci50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygi VGltZWxpbmVzIik7CisgICAgICAgIHRoaXMuX2Jhc2ljVGl0bGVCYXIuY2xhc3NMaXN0LmFkZChX ZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuVGl0bGVCYXJTdHlsZUNsYXNzKTsKKyAg ICAgICAgdGhpcy5fYmFzaWNUaXRsZUJhci5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5UaW1l bGluZVNpZGViYXJQYW5lbC5UaW1lbGluZXNUaXRsZUJhclN0eWxlQ2xhc3MpOworICAgICAgICB0 aGlzLmVsZW1lbnQuaW5zZXJ0QmVmb3JlKHRoaXMuX2Jhc2ljVGl0bGVCYXIsIHRoaXMuZWxlbWVu dC5maXJzdENoaWxkKTsKKwogICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLkZQU0luc3RydW1lbnQu c3VwcG9ydGVkKCkpIHsKICAgICAgICAgICAgIHZhciB0aW1lbGluZXNOYXZpZ2F0aW9uSXRlbSA9 IG5ldyBXZWJJbnNwZWN0b3IuUmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRlbShXZWJJbnNwZWN0b3Iu VGltZWxpbmVTaWRlYmFyUGFuZWwuVmlld01vZGUuVGltZWxpbmVzLCBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlRpbWVsaW5lcyIpKQogICAgICAgICAgICAgdmFyIHJlbmRlcmluZ0ZyYW1lc05hdmln YXRpb25JdGVtID0gbmV3IFdlYkluc3BlY3Rvci5SYWRpb0J1dHRvbk5hdmlnYXRpb25JdGVtKFdl Ykluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5WaWV3TW9kZS5SZW5kZXJpbmdGcmFtZXMs IFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVuZGVyaW5nIEZyYW1lcyIpKQogICAgICAgICAgICAg dGhpcy5fdmlld01vZGVOYXZpZ2F0aW9uQmFyID0gbmV3IFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9u QmFyKG51bGwsIFt0aW1lbGluZXNOYXZpZ2F0aW9uSXRlbSwgcmVuZGVyaW5nRnJhbWVzTmF2aWdh dGlvbkl0ZW1dLCAidGFibGlzdCIpOwogICAgICAgICAgICAgdGhpcy5fdmlld01vZGVOYXZpZ2F0 aW9uQmFyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25CYXIuRXZlbnQu TmF2aWdhdGlvbkl0ZW1TZWxlY3RlZCwgdGhpcy5fdmlld01vZGVTZWxlY3RlZCwgdGhpcyk7CiAK LSAgICAgICAgICAgIHZhciBjb250YWluZXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYi KTsKLSAgICAgICAgICAgIGNvbnRhaW5lci5jbGFzc05hbWUgPSAibmF2aWdhdGlvbi1iYXItY29u dGFpbmVyIjsKLSAgICAgICAgICAgIGNvbnRhaW5lci5hcHBlbmRDaGlsZCh0aGlzLl92aWV3TW9k ZU5hdmlnYXRpb25CYXIuZWxlbWVudCk7Ci0gICAgICAgICAgICB0aGlzLmVsZW1lbnQuaW5zZXJ0 QmVmb3JlKGNvbnRhaW5lciwgdGhpcy5lbGVtZW50LmZpcnN0Q2hpbGQpOworICAgICAgICAgICAg dGhpcy5fcmVuZGVyaW5nRnJhbWVzVGl0bGVCYXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJk aXYiKTsKKyAgICAgICAgICAgIHRoaXMuX3JlbmRlcmluZ0ZyYW1lc1RpdGxlQmFyLmNsYXNzTmFt ZSA9ICJuYXZpZ2F0aW9uLWJhci1jb250YWluZXIiOworICAgICAgICAgICAgdGhpcy5fcmVuZGVy aW5nRnJhbWVzVGl0bGVCYXIuYXBwZW5kQ2hpbGQodGhpcy5fdmlld01vZGVOYXZpZ2F0aW9uQmFy LmVsZW1lbnQpOworICAgICAgICAgICAgdGhpcy5fcmVuZGVyaW5nRnJhbWVzVGl0bGVCYXIuaGlk ZGVuID0gdHJ1ZTsKKyAgICAgICAgICAgIHRoaXMuZWxlbWVudC5pbnNlcnRCZWZvcmUodGhpcy5f cmVuZGVyaW5nRnJhbWVzVGl0bGVCYXIsIHRoaXMuZWxlbWVudC5maXJzdENoaWxkKTsKIAogICAg ICAgICAgICAgdGhpcy5fY2hhcnRDb2xvcnMgPSBuZXcgTWFwOwogICAgICAgICAgICAgdGhpcy5f Y2hhcnRDb2xvcnMuc2V0KFdlYkluc3BlY3Rvci5SZW5kZXJpbmdGcmFtZVRpbWVsaW5lUmVjb3Jk LlRhc2tUeXBlLlNjcmlwdCwgInJnYigxNTMsIDExMywgMTg1KSIpOwpAQCAtMTA2LDEyICsxMTMs NiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwgPSBjbGFzcyBUaW1lbGluZVNp ZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3BlYwogICAgICAgICAgICAgdmFyIGNoYXJ0R3JvdXAg PSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uR3JvdXAoW3RoaXMuX2ZyYW1lU2VsZWN0 aW9uQ2hhcnRSb3ddKTsKICAgICAgICAgICAgIHRoaXMuX2ZyYW1lU2VsZWN0aW9uQ2hhcnRTZWN0 aW9uID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvbigiZnJhbWVzLXNlbGVjdGlvbi1j aGFydCIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2VsZWN0ZWQgRnJhbWVzIiksIFtjaGFydEdy b3VwXSwgbnVsbCwgdHJ1ZSk7CiAgICAgICAgICAgICB0aGlzLl90aW1lbGluZXNDb250ZW50Q29u dGFpbmVyRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9mcmFtZVNlbGVjdGlvbkNoYXJ0U2VjdGlv bi5lbGVtZW50KTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHZhciB0aW1lbGluZXNU aXRsZUJhckVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAg ICAgIHRpbWVsaW5lc1RpdGxlQmFyRWxlbWVudC50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5V SVN0cmluZygiVGltZWxpbmVzIik7Ci0gICAgICAgICAgICB0aW1lbGluZXNUaXRsZUJhckVsZW1l bnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuVGl0bGVC YXJTdHlsZUNsYXNzKTsKLSAgICAgICAgICAgIHRpbWVsaW5lc1RpdGxlQmFyRWxlbWVudC5jbGFz c0xpc3QuYWRkKFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5UaW1lbGluZXNUaXRs ZUJhclN0eWxlQ2xhc3MpOwotICAgICAgICAgICAgdGhpcy5lbGVtZW50Lmluc2VydEJlZm9yZSh0 aW1lbGluZXNUaXRsZUJhckVsZW1lbnQsIHRoaXMuZWxlbWVudC5maXJzdENoaWxkKTsKICAgICAg ICAgfQogCiAgICAgICAgIHZhciBzdGF0dXNCYXJFbGVtZW50ID0gdGhpcy5fc3RhdHVzQmFyRWxl bWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwpAQCAtNzA4LDYgKzcwOSw4IEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbCA9IGNsYXNzIFRpbWVsaW5lU2lkZWJh clBhbmVsIGV4dGVuZHMgV2ViSW5zcGVjCiAgICAgICAgICAgICB0aGlzLl90aW1lbGluZVRyZWVF bGVtZW50TWFwLmNsZWFyKCk7CiAgICAgICAgIH0KIAorICAgICAgICB0aGlzLl9jbGVhckluc3Ry dW1lbnRzKCk7CisKICAgICAgICAgdGhpcy5fZGlzcGxheWVkUmVjb3JkaW5nID0gcmVjb3JkaW5n OwogICAgICAgICB0aGlzLl9kaXNwbGF5ZWRSZWNvcmRpbmcuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmcuRXZlbnQuSW5zdHJ1bWVudEFkZGVkLCB0aGlzLl9p bnN0cnVtZW50QWRkZWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9kaXNwbGF5ZWRSZWNvcmRpbmcu YWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmcuRXZlbnQuSW5z dHJ1bWVudFJlbW92ZWQsIHRoaXMuX2luc3RydW1lbnRSZW1vdmVkLCB0aGlzKTsKQEAgLTc0OCw2 ICs3NTEsMTIgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsID0gY2xhc3MgVGlt ZWxpbmVTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbnNwZWMKICAgICAgICAgdGhpcy5fcmVjb3Jk aW5nU2VsZWN0ZWQoV2ViSW5zcGVjdG9yLnRpbWVsaW5lTWFuYWdlci5hY3RpdmVSZWNvcmRpbmcp OwogICAgIH0KIAorICAgIF9jbGVhckluc3RydW1lbnRzKCkKKyAgICB7CisgICAgICAgIHRoaXMu X3RpbWVsaW5lVHJlZUVsZW1lbnRNYXAuY2xlYXIoKTsKKyAgICAgICAgdGhpcy5fcmVtb3ZlZEZQ U0luc3RydW1lbnQoKTsKKyAgICB9CisKICAgICBfaW5zdHJ1bWVudEFkZGVkKGluc3RydW1lbnRP ckV2ZW50KQogICAgIHsKICAgICAgICAgbGV0IGluc3RydW1lbnQgPSBpbnN0cnVtZW50T3JFdmVu dCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5JbnN0cnVtZW50ID8gaW5zdHJ1bWVudE9yRXZlbnQg OiBpbnN0cnVtZW50T3JFdmVudC5kYXRhLmluc3RydW1lbnQ7CkBAIC03NTcsNiArNzY2LDcgQEAg V2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsID0gY2xhc3MgVGltZWxpbmVTaWRlYmFy UGFuZWwgZXh0ZW5kcyBXZWJJbnNwZWMKICAgICAgICAgY29uc29sZS5hc3NlcnQoIXRoaXMuX3Rp bWVsaW5lVHJlZUVsZW1lbnRNYXAuaGFzKHRpbWVsaW5lKSwgdGltZWxpbmUpOwogCiAgICAgICAg IGlmICh0aW1lbGluZS50eXBlID09PSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5S ZW5kZXJpbmdGcmFtZSkgeworICAgICAgICAgICAgdGhpcy5fYWRkZWRGUFNJbnN0cnVtZW50KCk7 CiAgICAgICAgICAgICB0aW1lbGluZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1l bGluZS5FdmVudC5UaW1lc1VwZGF0ZWQsIHRoaXMuX3JlbmRlcmluZ0ZyYW1lVGltZWxpbmVUaW1l c1VwZGF0ZWQsIHRoaXMpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CkBAIC03ODMs NiArNzkzLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsID0gY2xhc3MgVGlt ZWxpbmVTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbnNwZWMKICAgICAgICAgbGV0IHRpbWVsaW5l ID0gdGhpcy5fZGlzcGxheWVkUmVjb3JkaW5nLnRpbWVsaW5lRm9ySW5zdHJ1bWVudChpbnN0cnVt ZW50KTsKIAogICAgICAgICBpZiAodGltZWxpbmUudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlRpbWVs aW5lUmVjb3JkLlR5cGUuUmVuZGVyaW5nRnJhbWUpIHsKKyAgICAgICAgICAgIHRoaXMuX3JlbW92 ZWRGUFNJbnN0cnVtZW50KCk7CiAgICAgICAgICAgICB0aW1lbGluZS5yZW1vdmVFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZS5FdmVudC5UaW1lc1VwZGF0ZWQsIHRoaXMuX3JlbmRl cmluZ0ZyYW1lVGltZWxpbmVUaW1lc1VwZGF0ZWQsIHRoaXMpOwogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9CkBAIC03OTgsNiArODA5LDE4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVNp ZGViYXJQYW5lbCA9IGNsYXNzIFRpbWVsaW5lU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW5zcGVj CiAgICAgICAgIHRoaXMuX3RpbWVsaW5lQ291bnRDaGFuZ2VkKCk7CiAgICAgfQogCisgICAgX2Fk ZGVkRlBTSW5zdHJ1bWVudCgpCisgICAgeworICAgICAgICB0aGlzLl9iYXNpY1RpdGxlQmFyLmhp ZGRlbiA9IHRydWU7CisgICAgICAgIHRoaXMuX3JlbmRlcmluZ0ZyYW1lc1RpdGxlQmFyLmhpZGRl biA9IGZhbHNlOworICAgIH0KKworICAgIF9yZW1vdmVkRlBTSW5zdHJ1bWVudCgpCisgICAgewor ICAgICAgICB0aGlzLl9iYXNpY1RpdGxlQmFyLmhpZGRlbiA9IGZhbHNlOworICAgICAgICB0aGlz Ll9yZW5kZXJpbmdGcmFtZXNUaXRsZUJhci5oaWRkZW4gPSB0cnVlOworICAgIH0KKwogICAgIF90 aW1lbGluZUNvdW50Q2hhbmdlZCgpCiAgICAgewogICAgICAgICB2YXIgcHJldmlvdXNUcmVlRWxl bWVudCA9IG51bGw7CkBAIC04MTAsMTQgKzgzMywzMiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVT aWRlYmFyUGFuZWwgPSBjbGFzcyBUaW1lbGluZVNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3Bl YwogICAgICAgICAgICAgcHJldmlvdXNUcmVlRWxlbWVudCA9IHRyZWVFbGVtZW50OwogICAgICAg ICB9CiAKLSAgICAgICAgdmFyIHRpbWVsaW5lSGVpZ2h0ID0gMzY7Ci0gICAgICAgIHZhciBldmVu dFRpdGxlQmFyT2Zmc2V0ID0gNTg7Ci0gICAgICAgIHZhciBjb250ZW50RWxlbWVudE9mZnNldCA9 IDgxOwotICAgICAgICB2YXIgdGltZWxpbmVDb3VudCA9IHRoaXMuX3RpbWVsaW5lVHJlZUVsZW1l bnRNYXAuc2l6ZTsKLQotICAgICAgICB0aGlzLl90aW1lbGluZXNDb250ZW50Q29udGFpbmVyRWxl bWVudC5zdHlsZS5oZWlnaHQgPSAodGltZWxpbmVIZWlnaHQgKiB0aW1lbGluZUNvdW50KSArICJw eCI7Ci0gICAgICAgIHRoaXMuX3RpbWVsaW5lRXZlbnRzVGl0bGVCYXJFbGVtZW50LnN0eWxlLnRv cCA9ICh0aW1lbGluZUhlaWdodCAqIHRpbWVsaW5lQ291bnQgKyBldmVudFRpdGxlQmFyT2Zmc2V0 KSArICJweCI7Ci0gICAgICAgIHRoaXMuY29udGVudEVsZW1lbnQuc3R5bGUudG9wID0gKHRpbWVs aW5lSGVpZ2h0ICogdGltZWxpbmVDb3VudCArIGNvbnRlbnRFbGVtZW50T2Zmc2V0KSArICJweCI7 CisgICAgICAgIHRoaXMuX3VwZGF0ZVRpbWVsaW5lT3ZlcnZpZXdIZWlnaHQoKTsKKyAgICB9CisK KyAgICBfdXBkYXRlVGltZWxpbmVPdmVydmlld0hlaWdodCgpCisgICAgeworICAgICAgICBjb25z dCB0aW1lbGluZUhlaWdodCA9IDM2OworICAgICAgICBjb25zdCBldmVudFRpdGxlQmFyT2Zmc2V0 ID0gNTg7CisgICAgICAgIGNvbnN0IGNvbnRlbnRFbGVtZW50T2Zmc2V0ID0gODE7CisgICAgICAg IGNvbnN0IHJlbmRlcmluZ0ZyYW1lc1RpbWVsaW5lSGVpZ2h0ID0gMTA4OworCisgICAgICAgIGlm ICghdGhpcy5fZGlzcGxheWVkQ29udGVudFZpZXcpCisgICAgICAgICAgICByZXR1cm47CisKKyAg ICAgICAgbGV0IG92ZXJ2aWV3SGVpZ2h0OworICAgICAgICBsZXQgY3VycmVudFRpbWVsaW5lVmll dyA9IHRoaXMuX2Rpc3BsYXllZENvbnRlbnRWaWV3LmN1cnJlbnRUaW1lbGluZVZpZXc7CisgICAg ICAgIGlmIChjdXJyZW50VGltZWxpbmVWaWV3ICYmIGN1cnJlbnRUaW1lbGluZVZpZXcucmVwcmVz ZW50ZWRPYmplY3QudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuUmVu ZGVyaW5nRnJhbWUpCisgICAgICAgICAgICBvdmVydmlld0hlaWdodCA9IHJlbmRlcmluZ0ZyYW1l c1RpbWVsaW5lSGVpZ2h0OworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIGxldCB0aW1lbGlu ZUNvdW50ID0gdGhpcy5fdGltZWxpbmVUcmVlRWxlbWVudE1hcC5zaXplOworICAgICAgICAgICAg aWYgKHRoaXMuX3RpbWVsaW5lVHJlZUVsZW1lbnRNYXAuaGFzKFdlYkluc3BlY3Rvci5UaW1lbGlu ZVJlY29yZC5UeXBlLlJlbmRlcmluZ0ZyYW1lKSkKKyAgICAgICAgICAgICAgICB0aW1lbGluZUNv dW50LS07CisgICAgICAgICAgICBvdmVydmlld0hlaWdodCA9IHRpbWVsaW5lQ291bnQgKiB0aW1l bGluZUhlaWdodDsKKyAgICAgICAgfQorCisgICAgICAgIHRoaXMuX3RpbWVsaW5lRXZlbnRzVGl0 bGVCYXJDb250YWluZXIuc3R5bGUudG9wID0gKG92ZXJ2aWV3SGVpZ2h0ICsgZXZlbnRUaXRsZUJh ck9mZnNldCkgKyAicHgiOworICAgICAgICB0aGlzLmNvbnRlbnRFbGVtZW50LnN0eWxlLnRvcCA9 IChvdmVydmlld0hlaWdodCArIGNvbnRlbnRFbGVtZW50T2Zmc2V0KSArICJweCI7CiAgICAgfQog CiAgICAgX3JlY29yZEdseXBoTW91c2VkT3ZlcihldmVudCkKQEAgLTg5Nyw2ICs5MzgsOCBAQCBX ZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwgPSBjbGFzcyBUaW1lbGluZVNpZGViYXJQ YW5lbCBleHRlbmRzIFdlYkluc3BlYwogICAgICAgICAgICAgICAgIHRoaXMuc2hvd1RpbWVsaW5l T3ZlcnZpZXcoKTsKICAgICAgICAgfQogCisgICAgICAgIHRoaXMuX3RpbWVsaW5lQ291bnRDaGFu Z2VkKCk7CisKICAgICAgICAgdGhpcy51cGRhdGVGaWx0ZXIoKTsKICAgICB9CiAK