143267 2015-03-31 10:07:43 -0700 Web Inspector: spacebar should pause/resume timeline recording when timelines are open 2015-07-07 22:25:44 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 burg webkit-unassigned commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1081655 0 burg 2015-03-31 10:07:43 -0700 .. and focus isn't somewhere else, like a search field. 1081657 1 webkit-bug-importer 2015-03-31 10:08:22 -0700 <rdar://problem/20365499> 1107515 2 256312 hi 2015-07-07 12:25:50 -0700 Created attachment 256312 Patch 1107536 3 256312 timothy 2015-07-07 13:14:05 -0700 Comment on attachment 256312 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256312&action=review > Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js:37 > + this._toggleRecordingShortcut = new WebInspector.KeyboardShortcut(null, WebInspector.KeyboardShortcut.Key.Space, this._toggleRecordingOnSpacebar.bind(this)); > + this._toggleRecordingShortcut.implicitlyPreventsDefault = false; > + > + this._toggleNewRecordingShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Shift, WebInspector.KeyboardShortcut.Key.Space, this._toggleNewRecordingOnSpacebar.bind(this)); > + this._toggleNewRecordingShortcut.implicitlyPreventsDefault = false; We should mention the shortcuts in a tooltip on the Record button in the sidebar. It might be easier to put this code in TimelineSidebarPanel, since it also toggles recording and you would have access to the shortcuts to use displayName for the tooltip. 1107641 4 256344 hi 2015-07-07 18:59:04 -0700 Created attachment 256344 Patch 1107669 5 256344 commit-queue 2015-07-07 22:25:40 -0700 Comment on attachment 256344 Patch Clearing flags on attachment: 256344 Committed r186489: <http://trac.webkit.org/changeset/186489> 1107670 6 commit-queue 2015-07-07 22:25:44 -0700 All reviewed patches have been landed. Closing bug. 256312 2015-07-07 12:25:50 -0700 2015-07-07 18:59:02 -0700 Patch bug-143267-20150707122451.patch text/plain 3993 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGU3OTE3ZmI1YTc4MWExMDUxZmY0ZTdmZjY5ZGJj YWViN2M5Njc4ZWEuLmU3YmUyMDkwNmZhOGEwODlkYzIyNzUyMmY3NGRlMDk3YzAyYjNkYmYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA3LTA3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBz cGFjZWJhciBzaG91bGQgcGF1c2UvcmVzdW1lIHRpbWVsaW5lIHJlY29yZGluZyB3aGVuIHRpbWVs aW5lcyBhcmUgb3BlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQzMjY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFiQ29udGVudFZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVUYWJDb250ZW50Vmlldyk6IEFkZGVkIHR3byBu ZXcga2V5Ym9hcmQgc2hvcnRjdXRzOiBzcGFjZSBhbmQgc2hpZnQtc3BhY2UuCisgICAgICAgIChX ZWJJbnNwZWN0b3IuVGltZWxpbmVUYWJDb250ZW50Vmlldy5wcm90b3R5cGUuZ2V0IHN1cHBvcnRz U3BsaXRDb250ZW50QnJvd3Nlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVUYWJD b250ZW50Vmlldy5wcm90b3R5cGUuc2hvd24pOiBFbmFibGVzIHRoZSBrZXlib2FyZCBzaG9ydGN1 dHMuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVUYWJDb250ZW50Vmlldy5wcm90b3R5 cGUuaGlkZGVuKTogRGlzYWJsZXMgdGhlIGtleWJvYXJkIHNob3J0Y3V0cy4KKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UaW1lbGluZVRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5fdG9nZ2xlUmVjb3Jk aW5nT25TcGFjZWJhcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVUYWJDb250ZW50 Vmlldy5wcm90b3R5cGUuX3RvZ2dsZU5ld1JlY29yZGluZ09uU3BhY2ViYXIpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlRpbWVsaW5lVGFiQ29udGVudFZpZXcucHJvdG90eXBlLl90b2dnbGVSZWNv cmRpbmcpOgorCiAyMDE1LTA3LTA2ICBNYXR0IEJha2VyICA8bWF0dGJha2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSZW5kZXJpbmcgRnJhbWUgYmFycyBhcHBlYXIgbWlz YWxpZ25lZCBhbmQgY29udGFpbiBnYXBzIHdoZW4gZGlzcGxheWluZyBzbWFsbCB0YXNrIHNlZ21l bnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmlldy5qcwppbmRleCBjMTZmMTM5NmZm MzFiNGIyMWQyY2M5NTYyZTk2MGZhOGJjYjBmNGExLi5kMDFkYWQ0ZmEzY2I0MTc5ZmUyZTViZTAy OTE4YmJmZDVjOTA4NTM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFiQ29udGVudFZpZXcuanMK QEAgLTI5LDYgKzI5LDEyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVRhYkNvbnRlbnRWaWV3ID0g ZnVuY3Rpb24oaWRlbnRpZmllcikKICAgICB2YXIgZGV0YWlsc1NpZGViYXJQYW5lbHMgPSBbV2Vi SW5zcGVjdG9yLnJlc291cmNlRGV0YWlsc1NpZGViYXJQYW5lbCwgV2ViSW5zcGVjdG9yLnByb2Jl RGV0YWlsc1NpZGViYXJQYW5lbF07CiAKICAgICBXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXJU YWJDb250ZW50Vmlldy5jYWxsKHRoaXMsIGlkZW50aWZpZXIgfHwgInRpbWVsaW5lIiwgInRpbWVs aW5lIiwgdGFiQmFySXRlbSwgV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLCBkZXRh aWxzU2lkZWJhclBhbmVscyk7CisKKyAgICB0aGlzLl90b2dnbGVSZWNvcmRpbmdTaG9ydGN1dCA9 IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChudWxsLCBXZWJJbnNwZWN0b3IuS2V5 Ym9hcmRTaG9ydGN1dC5LZXkuU3BhY2UsIHRoaXMuX3RvZ2dsZVJlY29yZGluZ09uU3BhY2ViYXIu YmluZCh0aGlzKSk7CisgICAgdGhpcy5fdG9nZ2xlUmVjb3JkaW5nU2hvcnRjdXQuaW1wbGljaXRs eVByZXZlbnRzRGVmYXVsdCA9IGZhbHNlOworCisgICAgdGhpcy5fdG9nZ2xlTmV3UmVjb3JkaW5n U2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9y LktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuU2hpZnQsIFdlYkluc3BlY3Rvci5LZXlib2FyZFNo b3J0Y3V0LktleS5TcGFjZSwgdGhpcy5fdG9nZ2xlTmV3UmVjb3JkaW5nT25TcGFjZWJhci5iaW5k KHRoaXMpKTsKKyAgICB0aGlzLl90b2dnbGVOZXdSZWNvcmRpbmdTaG9ydGN1dC5pbXBsaWNpdGx5 UHJldmVudHNEZWZhdWx0ID0gZmFsc2U7CiB9OwogCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVUYWJD b250ZW50Vmlldy5wcm90b3R5cGUgPSB7CkBAIC01Nyw2ICs2Myw0OCBAQCBXZWJJbnNwZWN0b3Iu VGltZWxpbmVUYWJDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgZ2V0IHN1cHBvcnRzU3Bs aXRDb250ZW50QnJvd3NlcigpCiAgICAgewogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfSwK KworICAgIHNob3duOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBXZWJJbnNwZWN0b3IuQ29u dGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5wcm90b3R5cGUuc2hvd24uY2FsbCh0aGlzKTsKKwor ICAgICAgICB0aGlzLl90b2dnbGVSZWNvcmRpbmdTaG9ydGN1dC5kaXNhYmxlZCA9IGZhbHNlOwor ICAgICAgICB0aGlzLl90b2dnbGVOZXdSZWNvcmRpbmdTaG9ydGN1dC5kaXNhYmxlZCA9IGZhbHNl OworICAgIH0sCisKKyAgICBoaWRkZW46IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIFdlYklu c3BlY3Rvci5Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5oaWRkZW4uY2Fs bCh0aGlzKTsKKworICAgICAgICB0aGlzLl90b2dnbGVSZWNvcmRpbmdTaG9ydGN1dC5kaXNhYmxl ZCA9IHRydWU7CisgICAgICAgIHRoaXMuX3RvZ2dsZU5ld1JlY29yZGluZ1Nob3J0Y3V0LmRpc2Fi bGVkID0gdHJ1ZTsKKyAgICB9LAorCisgICAgLy8gUHJpdmF0ZQorCisgICAgX3RvZ2dsZVJlY29y ZGluZ09uU3BhY2ViYXI6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgaWYgKFdlYklu c3BlY3Rvci5pc0V2ZW50VGFyZ2V0QW5FZGl0YWJsZUZpZWxkKGV2ZW50KSkKKyAgICAgICAgICAg IHJldHVybjsKKworICAgICAgICB0aGlzLl90b2dnbGVSZWNvcmRpbmcoKTsKKyAgICB9LAorCisg ICAgX3RvZ2dsZU5ld1JlY29yZGluZ09uU3BhY2ViYXI6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsK KyAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5pc0V2ZW50VGFyZ2V0QW5FZGl0YWJsZUZpZWxkKGV2 ZW50KSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLl90b2dnbGVSZWNvcmRp bmcodHJ1ZSk7CisgICAgfSwKKworICAgIF90b2dnbGVSZWNvcmRpbmc6IGZ1bmN0aW9uKG5ld1Jl Y29yZGluZykKKyAgICB7CisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5hZ2Vy LmlzQ2FwdHVyaW5nKCkpCisgICAgICAgICAgICBXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5hZ2Vy LnN0b3BDYXB0dXJpbmcoKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgV2ViSW5zcGVjdG9y LnRpbWVsaW5lTWFuYWdlci5zdGFydENhcHR1cmluZyhuZXdSZWNvcmRpbmcpOwogICAgIH0KIH07 CiAK 256344 2015-07-07 18:59:04 -0700 2015-07-07 22:25:40 -0700 Patch bug-143267-20150707185805.patch text/plain 6226 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGU3OTE3ZmI1YTc4MWExMDUxZmY0ZTdmZjY5ZGJj YWViN2M5Njc4ZWEuLjQyMmJmNjg5NTE0MjRkZjVlNmQwNzQzNWI5ZTYyZGRkMTYxMjljOGEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA3LTA3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBz cGFjZWJhciBzaG91bGQgcGF1c2UvcmVzdW1lIHRpbWVsaW5lIHJlY29yZGluZyB3aGVuIHRpbWVs aW5lcyBhcmUgb3BlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQzMjY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBMb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsKTogQWRkZWQgdHdvIG5ldyBr ZXlib2FyZCBzaG9ydGN1dHM6IHNwYWNlIGFuZCBzaGlmdC1zcGFjZS4KKyAgICAgICAgKFdlYklu c3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5wcm90b3R5cGUuc2hvd24pOiBFbmFibGVzIHRo ZSBrZXlib2FyZCBzaG9ydGN1dHMuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRl YmFyUGFuZWwucHJvdG90eXBlLmhpZGRlbik6IERpc2FibGVzIHRoZSBrZXlib2FyZCBzaG9ydGN1 dHMuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwucHJvdG90eXBl Ll90b2dnbGVSZWNvcmRpbmdPblNwYWNlYmFyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1l bGluZVNpZGViYXJQYW5lbC5wcm90b3R5cGUuX3RvZ2dsZU5ld1JlY29yZGluZ09uU3BhY2ViYXIp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLnByb3RvdHlwZS5f dG9nZ2xlUmVjb3JkaW5nKTogU3RhcnRzL3N0b3BzIHJlY29yZGluZy4KKwogMjAxNS0wNy0wNiAg TWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogUmVuZGVyaW5nIEZyYW1lIGJhcnMgYXBwZWFyIG1pc2FsaWduZWQgYW5kIGNvbnRhaW4gZ2Fw cyB3aGVuIGRpc3BsYXlpbmcgc21hbGwgdGFzayBzZWdtZW50cwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXpl ZFN0cmluZ3MuanMKaW5kZXggMWYzNjJkZGZlMWY5ZDdhZTZhY2ZiNjJjNzQyZjZmZDExNjFlNDdm Yi4uZWE5N2JiNTRiNjgxMWY0N2Y1NzQ3ODNmMDU4NmQ3Y2RjNDg1Y2RiZSAxMDA2NDQKR0lUIGJp bmFyeSBwYXRjaApkZWx0YSAzMjIKemNtYUYmaEkhUW88XyNZOz9ESDlsNyEoKV5mTWhCfEYlVCor bHJVcmYqJE9+KjBZZjR+R0xXNEZxKFExbTgxaks2CnpOTSRtUlJtNzBPcGZgRCttYmszfm1gQTI1 bFBgJHRQaFA5VjYtYlVMI2I3clRwdCZsT0EmKCYpO3g+T09uPng4YwpMJVk1XkRqcnl8eXZwX31A CgpkZWx0YSAzNApvY21aNFdmJSlBVjxfI1k7Q2ZqU1hPQDZCLUh+RlA0JnQhV3xFKWFrN1RQQHFP MDJaRE91bUF1NgoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RpbWVsaW5lU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFuZWwuanMKaW5kZXggN2NlMTAy OGNhZDA4NWUyM2E0ZTM3MDdhM2MyYTkzMzZhZjI3YzViMy4uNThjODM5OGU5YjdlZDM3ZmQ0OTJi MzQ4M2FhNjM3OGQ0NzgxNDMxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFuZWwuanMK QEAgLTEwNSw2ICsxMDUsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwgPSBj bGFzcyBUaW1lbGluZVNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3BlYwogCiAgICAgICAgIHRo aXMuX3JlY29yZEdseXBoRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwog ICAgICAgICB0aGlzLl9yZWNvcmRHbHlwaEVsZW1lbnQuY2xhc3NOYW1lID0gV2ViSW5zcGVjdG9y LlRpbWVsaW5lU2lkZWJhclBhbmVsLlJlY29yZEdseXBoU3R5bGVDbGFzczsKKyAgICAgICAgdGhp cy5fcmVjb3JkR2x5cGhFbGVtZW50LnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbGlj ayBvciBwcmVzcyB0aGUgc3BhY2ViYXIgdG8gcmVjb3JkLiIpCiAgICAgICAgIHRoaXMuX3JlY29y ZEdseXBoRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW92ZXIiLCB0aGlzLl9yZWNvcmRH bHlwaE1vdXNlZE92ZXIuYmluZCh0aGlzKSk7CiAgICAgICAgIHRoaXMuX3JlY29yZEdseXBoRWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW91dCIsIHRoaXMuX3JlY29yZEdseXBoTW91c2Vk T3V0LmJpbmQodGhpcykpOwogICAgICAgICB0aGlzLl9yZWNvcmRHbHlwaEVsZW1lbnQuYWRkRXZl bnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9yZWNvcmRHbHlwaENsaWNrZWQuYmluZCh0aGlzKSk7 CkBAIC0xNTUsNiArMTU2LDEyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbCA9 IGNsYXNzIFRpbWVsaW5lU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW5zcGVjCiAKICAgICAgICAg aWYgKFdlYkluc3BlY3Rvci50aW1lbGluZU1hbmFnZXIuYWN0aXZlUmVjb3JkaW5nKQogICAgICAg ICAgICAgdGhpcy5fcmVjb3JkaW5nTG9hZGVkKCk7CisKKyAgICAgICAgdGhpcy5fdG9nZ2xlUmVj b3JkaW5nU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQobnVsbCwg V2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5LlNwYWNlLCB0aGlzLl90b2dnbGVSZWNv cmRpbmdPblNwYWNlYmFyLmJpbmQodGhpcykpOworICAgICAgICB0aGlzLl90b2dnbGVSZWNvcmRp bmdTaG9ydGN1dC5pbXBsaWNpdGx5UHJldmVudHNEZWZhdWx0ID0gZmFsc2U7CisKKyAgICAgICAg dGhpcy5fdG9nZ2xlTmV3UmVjb3JkaW5nU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJv YXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuU2hpZnQs IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleS5TcGFjZSwgdGhpcy5fdG9nZ2xlTmV3 UmVjb3JkaW5nT25TcGFjZWJhci5iaW5kKHRoaXMpKTsKKyAgICAgICAgdGhpcy5fdG9nZ2xlTmV3 UmVjb3JkaW5nU2hvcnRjdXQuaW1wbGljaXRseVByZXZlbnRzRGVmYXVsdCA9IGZhbHNlOwogICAg IH0KIAogICAgIC8vIFB1YmxpYwpAQCAtMTY4LDYgKzE3NSwxNyBAQCBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVTaWRlYmFyUGFuZWwgPSBjbGFzcyBUaW1lbGluZVNpZGViYXJQYW5lbCBleHRlbmRzIFdl Ykluc3BlYwogCiAgICAgICAgIGlmICh0aGlzLnZpZXdNb2RlID09PSBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVTaWRlYmFyUGFuZWwuVmlld01vZGUuUmVuZGVyaW5nRnJhbWVzKQogICAgICAgICAgICAg dGhpcy5fcmVmcmVzaEZyYW1lU2VsZWN0aW9uQ2hhcnQoKTsKKworICAgICAgICB0aGlzLl90b2dn bGVSZWNvcmRpbmdTaG9ydGN1dC5kaXNhYmxlZCA9IGZhbHNlOworICAgICAgICB0aGlzLl90b2dn bGVOZXdSZWNvcmRpbmdTaG9ydGN1dC5kaXNhYmxlZCA9IGZhbHNlOworICAgIH0KKworICAgIGhp ZGRlbigpCisgICAgeworICAgICAgICBzdXBlci5oaWRkZW4oKTsKKworICAgICAgICB0aGlzLl90 b2dnbGVSZWNvcmRpbmdTaG9ydGN1dC5kaXNhYmxlZCA9IHRydWU7CisgICAgICAgIHRoaXMuX3Rv Z2dsZU5ld1JlY29yZGluZ1Nob3J0Y3V0LmRpc2FibGVkID0gdHJ1ZTsKICAgICB9CiAKICAgICBj bG9zZWQoKQpAQCAtNDM5LDYgKzQ1NywzNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFy UGFuZWwgPSBjbGFzcyBUaW1lbGluZVNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3BlYwogCiAg ICAgLy8gUHJpdmF0ZQogCisgICAgX3RvZ2dsZVJlY29yZGluZ09uU3BhY2ViYXIoZXZlbnQpCisg ICAgeworICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLmlzRXZlbnRUYXJnZXRBbkVkaXRhYmxlRmll bGQoZXZlbnQpKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHRoaXMuX3RvZ2dsZVJl Y29yZGluZygpOworICAgIH0KKworICAgIF90b2dnbGVOZXdSZWNvcmRpbmdPblNwYWNlYmFyKGV2 ZW50KQorICAgIHsKKyAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5pc0V2ZW50VGFyZ2V0QW5FZGl0 YWJsZUZpZWxkKGV2ZW50KSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLl90 b2dnbGVSZWNvcmRpbmcodHJ1ZSk7CisgICAgfQorCisgICAgX3RvZ2dsZVJlY29yZGluZyhzaG91 bGRDcmVhdGVSZWNvcmRpbmcpCisgICAgeworICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLnRpbWVs aW5lTWFuYWdlci5pc0NhcHR1cmluZygpKSB7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IudGlt ZWxpbmVNYW5hZ2VyLnN0b3BDYXB0dXJpbmcoKTsKKworICAgICAgICAgICAgdGhpcy5fcmVjb3Jk R2x5cGhFbGVtZW50LnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbGljayBvciBwcmVz cyB0aGUgc3BhY2ViYXIgdG8gcmVjb3JkLiIpCisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAg ICBXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5hZ2VyLnN0YXJ0Q2FwdHVyaW5nKHNob3VsZENyZWF0 ZVJlY29yZGluZyk7CisgICAgICAgICAgICAvLyBTaG93IHRoZSB0aW1lbGluZSB0byB3aGljaCBl dmVudHMgd2lsbCBiZSBhcHBlbmRlZC4KKyAgICAgICAgICAgIHRoaXMuX3JlY29yZGluZ0xvYWRl ZCgpOworCisgICAgICAgICAgICB0aGlzLl9yZWNvcmRHbHlwaEVsZW1lbnQudGl0bGUgPSBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkNsaWNrIG9yIHByZXNzIHRoZSBzcGFjZWJhciB0byBzdG9wIHJl Y29yZGluZy4iKQorICAgICAgICB9CisgICAgfQorCiAgICAgX3RyZWVFbGVtZW50R29Ub0Fycm93 V2FzQ2xpY2tlZChldmVudCkKICAgICB7CiAgICAgICAgIHRoaXMuX2NsaWNrZWRUcmVlRWxlbWVu dEdvVG9BcnJvdyA9IHRydWU7CkBAIC02OTMsMTUgKzc0Miw3IEBAIFdlYkluc3BlY3Rvci5UaW1l bGluZVNpZGViYXJQYW5lbCA9IGNsYXNzIFRpbWVsaW5lU2lkZWJhclBhbmVsIGV4dGVuZHMgV2Vi SW5zcGVjCiAgICAgICAgIC8vIEFkZCBmb3JjZWQgY2xhc3MgdG8gcHJldmVudCB0aGUgZ2x5cGgg ZnJvbSBzaG93aW5nIGEgY29uZnVzaW5nIHN0YXR1cyBhZnRlciBjbGljay4KICAgICAgICAgdGhp cy5fcmVjb3JkR2x5cGhFbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLlRpbWVsaW5l U2lkZWJhclBhbmVsLlJlY29yZEdseXBoUmVjb3JkaW5nRm9yY2VkU3R5bGVDbGFzcyk7CiAKLSAg ICAgICAgdmFyIHNob3VsZENyZWF0ZVJlY29yZGluZyA9IGV2ZW50LnNoaWZ0S2V5OwotCi0gICAg ICAgIGlmIChXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5hZ2VyLmlzQ2FwdHVyaW5nKCkpCi0gICAg ICAgICAgICBXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5hZ2VyLnN0b3BDYXB0dXJpbmcoKTsKLSAg ICAgICAgZWxzZSB7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5hZ2VyLnN0 YXJ0Q2FwdHVyaW5nKHNob3VsZENyZWF0ZVJlY29yZGluZyk7Ci0gICAgICAgICAgICAvLyBTaG93 IHRoZSB0aW1lbGluZSB0byB3aGljaCBldmVudHMgd2lsbCBiZSBhcHBlbmRlZC4KLSAgICAgICAg ICAgIHRoaXMuX3JlY29yZGluZ0xvYWRlZCgpOwotICAgICAgICB9CisgICAgICAgIHRoaXMuX3Rv Z2dsZVJlY29yZGluZyhldmVudC5zaGlmdEtleSk7CiAgICAgfQogCiAgICAgX3ZpZXdNb2RlU2Vs ZWN0ZWQoZXZlbnQpCg==