156223 2016-04-04 20:10:20 -0700 Web Inspector: Should not allow selecting no Timelines when editing in Timeline tab 2016-04-05 15:32:12 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck mattbaker bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1180657 0 joepeck 2016-04-04 20:10:20 -0700 * SUMMARY Should not allow selecting no Timelines when editing in Timeline panel. * STEPS TO REPRODUCE 1. Open inspector 2. Show Timelines tab 3. Click "Edit" 4. Uncheck all Timelines 5. Click "Done" => Poor UI I would expect that you can't click "Done" unless at least one timeline is selected. 1180810 1 webkit-bug-importer 2016-04-05 08:13:51 -0700 <rdar://problem/25552221> 1180931 2 mattbaker 2016-04-05 13:01:25 -0700 We could either: a) Disable "Done" if no timeline are selected. b) Prevent deselecting the last timeline. I think I like the original suggestion (a). 1180941 3 timothy 2016-04-05 13:23:08 -0700 I like option A too. 1180951 4 275686 mattbaker 2016-04-05 13:35:23 -0700 Created attachment 275686 [Patch] Proposed Fix 1180973 5 275686 joepeck 2016-04-05 14:14:51 -0700 Comment on attachment 275686 [Patch] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=275686&action=review r=me, but test switching to "change" event > Source/WebInspectorUI/UserInterface/Views/TimelineTreeElement.js:90 > + button.addEventListener(WebInspector.TreeElementStatusButton.Event.Clicked, () => { this._dispatchEnabledDidChangeEvent(); }); Seems this click handler would be better off as: checkboxElement.addEventListener("change", () => { this._dispatchEnabledDidChangeEvent(); }); Instead of relying on TreeElementStatusButton clicked events, which might not change the checkbox state. And you are guaranteed that this will happen _after_ the checkbox changes. Right now I am not sure of the order. Note, you need both this and the _clickHandler method, since programmatically changing the checked state of an input does not dispatch a "change" event. 1180978 6 275696 mattbaker 2016-04-05 14:29:23 -0700 Created attachment 275696 [Patch] Proposed Fix 1181007 7 275696 commit-queue 2016-04-05 15:32:07 -0700 Comment on attachment 275696 [Patch] Proposed Fix Clearing flags on attachment: 275696 Committed r199077: <http://trac.webkit.org/changeset/199077> 1181008 8 commit-queue 2016-04-05 15:32:12 -0700 All reviewed patches have been landed. Closing bug. 275686 2016-04-05 13:35:23 -0700 2016-04-05 14:29:19 -0700 [Patch] Proposed Fix bug-156223-20160405133524.patch text/plain 4971 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5MDY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj Zjc0MGE0OTQyMGNlY2MyZDkyNWM1MjIyNzA3YjUxZjJhYzFhZWRiLi5jNDgyZTFiNTM1NGUyNTVi ZTdjZGU5ZTQ2NzMzYmM4YWUxYTViYzVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMSBAQAorMjAxNi0wNC0wNSAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogU2hvdWxkIG5vdCBhbGxvdyBzZWxlY3Rpbmcgbm8g VGltZWxpbmVzIHdoZW4gZWRpdGluZyBpbiBUaW1lbGluZSB0YWIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjIyMworICAgICAgICA8cmRhcjovL3By b2JsZW0vMjU1NTIyMjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUuX3N0YXJ0RWRpdGluZ0luc3RydW1lbnRzKToK KyAgICAgICAgUmVnaXN0ZXIgRW5hYmxlZERpZENoYW5nZSBldmVudCBoYW5kbGVyIGZvciBhbGwg dHJlZSBlbGVtZW50cy4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcu cHJvdG90eXBlLl9zdG9wRWRpdGluZ0luc3RydW1lbnRzKToKKyAgICAgICAgVW5yZWdpc3RlciBl dmVudCBoYW5kbGVyIGZvciBlbmFibGVkIHRyZWUgZWxlbWVudHMuIFRoZSByZXN0IGFyZSByZW1v dmVkCisgICAgICAgIGZyb20gdGhlIHRyZWUgb3V0bGluZSBvbmNlIGVkaXRpbmcgaGFzIGNvbXBs ZXRlZC4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcucHJvdG90eXBl Ll90aW1lbGluZVRyZWVFbGVtZW50RW5hYmxlZERpZENoYW5nZSk6CisgICAgICAgIEVuYWJsZSAi RG9uZSIgYnV0dG9uIGlmIGF0IGxlYXN0IG9uZSB0aW1lbGluZSBpcyBlbmFibGVkLgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRyZWVFbGVtZW50LmpzOgorICAgICAg ICBEaXNwYXRjaCBhIG5ldyBldmVudCwgRW5hYmxlZERpZENoYW5nZSwgd2hlbiB0aGUgY2hlY2ti b3ggc3RhdGUgY2hhbmdlcy4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVHJlZUVs ZW1lbnQucHJvdG90eXBlLl9zaG93Q2hlY2tib3gpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRp bWVsaW5lVHJlZUVsZW1lbnQucHJvdG90eXBlLl9jbGlja0hhbmRsZXIpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlRpbWVsaW5lVHJlZUVsZW1lbnQucHJvdG90eXBlLl9kaXNwYXRjaEVuYWJsZWRE aWRDaGFuZ2VFdmVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVUcmVlRWxlbWVu dCk6CisKIDIwMTYtMDQtMDQgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4K IAogICAgICAgICBVbmNhdWdodCBFeGNlcHRpb246IEVycm9yOiBDYW4ndCBtYWtlIGEgQ29udGVu dFZpZXcgZm9yIGFuIHVua25vd24gcmVwcmVzZW50ZWRPYmplY3QgKEFwcGxpY2F0aW9uQ2FjaGVN YW5pZmVzdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzCmluZGV4IDMyZGEyNzA0NjkyYTlhNDVl ZDU3NmRmOGRhNDFkZjcxNTVjNTQwZWMuLjFhMDhjMTcwMDI4NTMwZmNhMjE3ODNiOTA1NWU1MjIx NTgyNTM2YTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5qcwpAQCAtODc2LDYgKzg3Niw3IEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3ID0gY2xhc3MgVGltZWxpbmVPdmVydmlldyBl eHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIHRy ZWVFbGVtZW50LmVkaXRpbmcgPSB0cnVlOworICAgICAgICAgICAgdHJlZUVsZW1lbnQuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVUcmVlRWxlbWVudC5FdmVudC5FbmFibGVk RGlkQ2hhbmdlLCB0aGlzLl90aW1lbGluZVRyZWVFbGVtZW50RW5hYmxlZERpZENoYW5nZSwgdGhp cyk7CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLl9lZGl0aW5nSW5zdHJ1bWVudHNEaWRDaGFu Z2UoKTsKQEAgLTg5Miw2ICs4OTMsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldyA9 IGNsYXNzIFRpbWVsaW5lT3ZlcnZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAg ICBmb3IgKGxldCB0cmVlRWxlbWVudCBvZiB0aGlzLl90cmVlRWxlbWVudHNCeVR5cGVNYXAudmFs dWVzKCkpIHsKICAgICAgICAgICAgIGlmICh0cmVlRWxlbWVudC5zdGF0dXMuY2hlY2tlZCkgewog ICAgICAgICAgICAgICAgIHRyZWVFbGVtZW50LmVkaXRpbmcgPSBmYWxzZTsKKyAgICAgICAgICAg ICAgICB0cmVlRWxlbWVudC5yZW1vdmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGlu ZVRyZWVFbGVtZW50LkV2ZW50LkVuYWJsZWREaWRDaGFuZ2UsIHRoaXMuX3RpbWVsaW5lVHJlZUVs ZW1lbnRFbmFibGVkRGlkQ2hhbmdlLCB0aGlzKTsKICAgICAgICAgICAgICAgICBjb250aW51ZTsK ICAgICAgICAgICAgIH0KIApAQCAtOTQ0LDYgKzk0NiwxNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmVPdmVydmlldyA9IGNsYXNzIFRpbWVsaW5lT3ZlcnZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu VmlldwogICAgICAgICBsZXQgYlRpbWVsaW5lSW5kZXggPSB0aGlzLl9pbnN0cnVtZW50VHlwZXMu aW5kZXhPZihiVGltZWxpbmVUeXBlKTsKICAgICAgICAgcmV0dXJuIGFUaW1lbGluZUluZGV4IC0g YlRpbWVsaW5lSW5kZXg7CiAgICAgfQorCisgICAgX3RpbWVsaW5lVHJlZUVsZW1lbnRFbmFibGVk RGlkQ2hhbmdlKGV2ZW50KQorICAgIHsKKyAgICAgICAgbGV0IGVuYWJsZWQgPSB0aGlzLl90aW1l bGluZXNUcmVlT3V0bGluZS5jaGlsZHJlbi5zb21lKCh0cmVlRWxlbWVudCkgPT4geworICAgICAg ICAgICAgbGV0IHRpbWVsaW5lVHlwZSA9IHRyZWVFbGVtZW50LnJlcHJlc2VudGVkT2JqZWN0LnR5 cGU7CisgICAgICAgICAgICByZXR1cm4gdGhpcy5fY2FuU2hvd1RpbWVsaW5lVHlwZSh0aW1lbGlu ZVR5cGUpICYmIHRyZWVFbGVtZW50LnN0YXR1cy5jaGVja2VkOworICAgICAgICB9KTsKKworICAg ICAgICB0aGlzLl9lZGl0SW5zdHJ1bWVudHNCdXR0b24uZW5hYmxlZCA9IGVuYWJsZWQ7CisgICAg fQogfTsKIAogV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcuU2Nyb2xsRGVsdGFEZW5vbWlu YXRvciA9IDUwMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RpbWVsaW5lVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRyZWVFbGVtZW50LmpzCmluZGV4IDAwOTM5ZTM3 MWQ1Mjc1OTFmY2NmYWI4Y2VjMzFjNWFmNmRmYjMzNzYuLjBiZjRhOTk3MWIyODU5MmEyMzU1ZDQ3 ZTNhMDVkNjhiOWViNDU3NzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUcmVlRWxlbWVudC5qcwpAQCAt ODcsNiArODcsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVUcmVlRWxlbWVudCA9IGNsYXNzIFRp bWVsaW5lVHJlZUVsZW1lbnQgZXh0ZW5kcyBXZWJJbnNwZWN0bwogICAgICAgICBjaGVja2JveEVs ZW1lbnQuY2hlY2tlZCA9ICF0aGlzLl9wbGFjZWhvbGRlcjsKIAogICAgICAgICBsZXQgYnV0dG9u ID0gbmV3IFdlYkluc3BlY3Rvci5UcmVlRWxlbWVudFN0YXR1c0J1dHRvbihjaGVja2JveEVsZW1l bnQpOworICAgICAgICBidXR0b24uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVHJlZUVs ZW1lbnRTdGF0dXNCdXR0b24uRXZlbnQuQ2xpY2tlZCwgKCkgPT4geyB0aGlzLl9kaXNwYXRjaEVu YWJsZWREaWRDaGFuZ2VFdmVudCgpOyB9KTsKKwogICAgICAgICB0aGlzLnN0YXR1cyA9IGNoZWNr Ym94RWxlbWVudDsKICAgICB9CiAKQEAgLTEwNCw1ICsxMDYsMTUgQEAgV2ViSW5zcGVjdG9yLlRp bWVsaW5lVHJlZUVsZW1lbnQgPSBjbGFzcyBUaW1lbGluZVRyZWVFbGVtZW50IGV4dGVuZHMgV2Vi SW5zcGVjdG8KICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB0aGlzLnN0YXR1cy5jaGVj a2VkID0gIXRoaXMuc3RhdHVzLmNoZWNrZWQ7CisgICAgICAgIHRoaXMuX2Rpc3BhdGNoRW5hYmxl ZERpZENoYW5nZUV2ZW50KCk7CisgICAgfQorCisgICAgX2Rpc3BhdGNoRW5hYmxlZERpZENoYW5n ZUV2ZW50KCkKKyAgICB7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdl Ykluc3BlY3Rvci5UaW1lbGluZVRyZWVFbGVtZW50LkV2ZW50LkVuYWJsZWREaWRDaGFuZ2UpOwog ICAgIH0KIH07CisKK1dlYkluc3BlY3Rvci5UaW1lbGluZVRyZWVFbGVtZW50LkV2ZW50ID0gewor ICAgIEVuYWJsZWREaWRDaGFuZ2U6ICJ0aW1lbGluZS10cmVlLWVsZW1lbnQtZW5hYmxlZC1kaWQt Y2hhbmdlIgorfTsK 275696 2016-04-05 14:29:23 -0700 2016-04-05 15:32:07 -0700 [Patch] Proposed Fix bug-156223-20160405142923.patch text/plain 4939 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj Zjc0MGE0OTQyMGNlY2MyZDkyNWM1MjIyNzA3YjUxZjJhYzFhZWRiLi5hYTI1NjgzMDA5NWEyY2Y3 MTE3Y2ZjYWViMzQyYWIyZjRiNGYzY2RjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMSBAQAorMjAxNi0wNC0wNSAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogU2hvdWxkIG5vdCBhbGxvdyBzZWxlY3Rpbmcgbm8g VGltZWxpbmVzIHdoZW4gZWRpdGluZyBpbiBUaW1lbGluZSB0YWIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjIyMworICAgICAgICA8cmRhcjovL3By b2JsZW0vMjU1NTIyMjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRpbWVsaW5lT3ZlcnZpZXcucHJvdG90eXBlLl9zdGFydEVkaXRpbmdJbnN0cnVtZW50cyk6 CisgICAgICAgIFJlZ2lzdGVyIEVuYWJsZWREaWRDaGFuZ2UgZXZlbnQgaGFuZGxlciBmb3IgYWxs IHRyZWUgZWxlbWVudHMuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3 LnByb3RvdHlwZS5fc3RvcEVkaXRpbmdJbnN0cnVtZW50cyk6CisgICAgICAgIFVucmVnaXN0ZXIg ZXZlbnQgaGFuZGxlciBmb3IgZW5hYmxlZCB0cmVlIGVsZW1lbnRzLiBUaGUgcmVzdCBhcmUgcmVt b3ZlZAorICAgICAgICBmcm9tIHRoZSB0cmVlIG91dGxpbmUgb25jZSBlZGl0aW5nIGhhcyBjb21w bGV0ZWQuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlw ZS5fdGltZWxpbmVUcmVlRWxlbWVudEVuYWJsZWREaWRDaGFuZ2UpOgorICAgICAgICBFbmFibGUg IkRvbmUiIGJ1dHRvbiBpZiBhdCBsZWFzdCBvbmUgdGltZWxpbmUgaXMgZW5hYmxlZC4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUcmVlRWxlbWVudC5qczoKKyAgICAg ICAgRGlzcGF0Y2ggYSBuZXcgZXZlbnQsIEVuYWJsZWREaWRDaGFuZ2UsIHdoZW4gdGhlIGNoZWNr Ym94IHN0YXRlIGNoYW5nZXMuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVRyZWVF bGVtZW50LnByb3RvdHlwZS5fc2hvd0NoZWNrYm94KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U aW1lbGluZVRyZWVFbGVtZW50LnByb3RvdHlwZS5fY2xpY2tIYW5kbGVyKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UaW1lbGluZVRyZWVFbGVtZW50LnByb3RvdHlwZS5fZGlzcGF0Y2hFbmFibGVk RGlkQ2hhbmdlRXZlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVHJlZUVsZW1l bnQpOgorCiAyMDE2LTA0LTA0ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+ CiAKICAgICAgICAgVW5jYXVnaHQgRXhjZXB0aW9uOiBFcnJvcjogQ2FuJ3QgbWFrZSBhIENvbnRl bnRWaWV3IGZvciBhbiB1bmtub3duIHJlcHJlc2VudGVkT2JqZWN0IChBcHBsaWNhdGlvbkNhY2hl TWFuaWZlc3QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5qcwppbmRleCAzMmRhMjcwNDY5MmE5YTQ1 ZWQ1NzZkZjhkYTQxZGY3MTU1YzU0MGVjLi4xYTA4YzE3MDAyODUzMGZjYTIxNzgzYjkwNTVlNTIy MTU4MjUzNmExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuanMKQEAgLTg3Niw2ICs4NzYsNyBA QCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldyA9IGNsYXNzIFRpbWVsaW5lT3ZlcnZpZXcg ZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICB0 cmVlRWxlbWVudC5lZGl0aW5nID0gdHJ1ZTsKKyAgICAgICAgICAgIHRyZWVFbGVtZW50LmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVHJlZUVsZW1lbnQuRXZlbnQuRW5hYmxl ZERpZENoYW5nZSwgdGhpcy5fdGltZWxpbmVUcmVlRWxlbWVudEVuYWJsZWREaWRDaGFuZ2UsIHRo aXMpOwogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5fZWRpdGluZ0luc3RydW1lbnRzRGlkQ2hh bmdlKCk7CkBAIC04OTIsNiArODkzLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcg PSBjbGFzcyBUaW1lbGluZU92ZXJ2aWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAg ICAgZm9yIChsZXQgdHJlZUVsZW1lbnQgb2YgdGhpcy5fdHJlZUVsZW1lbnRzQnlUeXBlTWFwLnZh bHVlcygpKSB7CiAgICAgICAgICAgICBpZiAodHJlZUVsZW1lbnQuc3RhdHVzLmNoZWNrZWQpIHsK ICAgICAgICAgICAgICAgICB0cmVlRWxlbWVudC5lZGl0aW5nID0gZmFsc2U7CisgICAgICAgICAg ICAgICAgdHJlZUVsZW1lbnQucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxp bmVUcmVlRWxlbWVudC5FdmVudC5FbmFibGVkRGlkQ2hhbmdlLCB0aGlzLl90aW1lbGluZVRyZWVF bGVtZW50RW5hYmxlZERpZENoYW5nZSwgdGhpcyk7CiAgICAgICAgICAgICAgICAgY29udGludWU7 CiAgICAgICAgICAgICB9CiAKQEAgLTk0NCw2ICs5NDYsMTYgQEAgV2ViSW5zcGVjdG9yLlRpbWVs aW5lT3ZlcnZpZXcgPSBjbGFzcyBUaW1lbGluZU92ZXJ2aWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9y LlZpZXcKICAgICAgICAgbGV0IGJUaW1lbGluZUluZGV4ID0gdGhpcy5faW5zdHJ1bWVudFR5cGVz LmluZGV4T2YoYlRpbWVsaW5lVHlwZSk7CiAgICAgICAgIHJldHVybiBhVGltZWxpbmVJbmRleCAt IGJUaW1lbGluZUluZGV4OwogICAgIH0KKworICAgIF90aW1lbGluZVRyZWVFbGVtZW50RW5hYmxl ZERpZENoYW5nZShldmVudCkKKyAgICB7CisgICAgICAgIGxldCBlbmFibGVkID0gdGhpcy5fdGlt ZWxpbmVzVHJlZU91dGxpbmUuY2hpbGRyZW4uc29tZSgodHJlZUVsZW1lbnQpID0+IHsKKyAgICAg ICAgICAgIGxldCB0aW1lbGluZVR5cGUgPSB0cmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdC50 eXBlOworICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2NhblNob3dUaW1lbGluZVR5cGUodGltZWxp bmVUeXBlKSAmJiB0cmVlRWxlbWVudC5zdGF0dXMuY2hlY2tlZDsKKyAgICAgICAgfSk7CisKKyAg ICAgICAgdGhpcy5fZWRpdEluc3RydW1lbnRzQnV0dG9uLmVuYWJsZWQgPSBlbmFibGVkOworICAg IH0KIH07CiAKIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LlNjcm9sbERlbHRhRGVub21p bmF0b3IgPSA1MDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9UaW1lbGluZVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUcmVlRWxlbWVudC5qcwppbmRleCAwMDkzOWUz NzFkNTI3NTkxZmNjZmFiOGNlYzMxYzVhZjZkZmIzMzc2Li5jMDJiNzdlZTgxNDUxYTNjMGVjMzgw N2ZlYzhmODQ2YjJlN2QxZGY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVHJlZUVsZW1lbnQuanMKQEAg LTg3LDYgKzg3LDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lVHJlZUVsZW1lbnQgPSBjbGFzcyBU aW1lbGluZVRyZWVFbGVtZW50IGV4dGVuZHMgV2ViSW5zcGVjdG8KICAgICAgICAgY2hlY2tib3hF bGVtZW50LmNoZWNrZWQgPSAhdGhpcy5fcGxhY2Vob2xkZXI7CiAKICAgICAgICAgbGV0IGJ1dHRv biA9IG5ldyBXZWJJbnNwZWN0b3IuVHJlZUVsZW1lbnRTdGF0dXNCdXR0b24oY2hlY2tib3hFbGVt ZW50KTsKKyAgICAgICAgY2hlY2tib3hFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNoYW5nZSIs ICgpID0+IHsgdGhpcy5fZGlzcGF0Y2hFbmFibGVkRGlkQ2hhbmdlRXZlbnQoKTsgfSk7CisKICAg ICAgICAgdGhpcy5zdGF0dXMgPSBjaGVja2JveEVsZW1lbnQ7CiAgICAgfQogCkBAIC0xMDQsNSAr MTA2LDE1IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVRyZWVFbGVtZW50ID0gY2xhc3MgVGltZWxp bmVUcmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3BlY3RvCiAgICAgICAgICAgICByZXR1cm47CiAK ICAgICAgICAgdGhpcy5zdGF0dXMuY2hlY2tlZCA9ICF0aGlzLnN0YXR1cy5jaGVja2VkOworICAg ICAgICB0aGlzLl9kaXNwYXRjaEVuYWJsZWREaWRDaGFuZ2VFdmVudCgpOworICAgIH0KKworICAg IF9kaXNwYXRjaEVuYWJsZWREaWRDaGFuZ2VFdmVudCgpCisgICAgeworICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVGltZWxpbmVUcmVlRWxlbWVudC5F dmVudC5FbmFibGVkRGlkQ2hhbmdlKTsKICAgICB9CiB9OworCitXZWJJbnNwZWN0b3IuVGltZWxp bmVUcmVlRWxlbWVudC5FdmVudCA9IHsKKyAgICBFbmFibGVkRGlkQ2hhbmdlOiAidGltZWxpbmUt dHJlZS1lbGVtZW50LWVuYWJsZWQtZGlkLWNoYW5nZSIKK307Cg==