194365 2019-02-06 15:55:45 -0800 Web Inspector: Timelines: clicking on an empty space in the overview should deselect any selected record bar 2019-02-12 10:22:47 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1503512 0 hi 2019-02-06 15:55:45 -0800 Once a record becomes selected, it's basically impossible to deselect it. We should provide a way to deselect that makes sense. 1503513 1 webkit-bug-importer 2019-02-06 15:56:06 -0800 <rdar://problem/47868426> 1503514 2 webkit-bug-importer 2019-02-06 15:56:17 -0800 <rdar://problem/47868425> 1503854 3 hi 2019-02-07 11:51:04 -0800 <rdar://problem/47868426> 1503860 4 361425 hi 2019-02-07 11:57:33 -0800 Created attachment 361425 Patch 1504963 5 361425 joepeck 2019-02-11 12:36:44 -0800 Comment on attachment 361425 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=361425&action=review r=me > Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js:392 > + // Ensure that the container "click" listener added by `WI.TimelineOverview` isn't called. > + event.__timelineRecordBarClick = true; Can we just stop propagation? 1505250 6 361425 hi 2019-02-12 09:56:32 -0800 Comment on attachment 361425 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=361425&action=review >> Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js:392 >> + event.__timelineRecordBarClick = true; > > Can we just stop propagation? My fear with that is that we'd end up breaking some other functionality with the mouse in Timelines. This approach seems the least likely to cause regressions. 1505266 7 361425 commit-queue 2019-02-12 10:22:46 -0800 Comment on attachment 361425 Patch Clearing flags on attachment: 361425 Committed r241302: <https://trac.webkit.org/changeset/241302> 1505267 8 commit-queue 2019-02-12 10:22:47 -0800 All reviewed patches have been landed. Closing bug. 361425 2019-02-07 11:57:33 -0800 2019-02-12 10:22:46 -0800 Patch bug-194365-20190207115732.patch text/plain 10120 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDI3OGZmOTFkYTg5ZjMyM2E1ZTc4OWRiYmMxM2Nl NTQ2Y2I5NmI4Y2YuLjVlZGJiM2U2NDc1YmEzMGVjOGVmNTUwMDlmMGFkMWY0N2IzY2VmMzcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE5LTAyLTA3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBU aW1lbGluZXM6IGNsaWNraW5nIG9uIGFuIGVtcHR5IHNwYWNlIGluIHRoZSBvdmVydmlldyBzaG91 bGQgZGVzZWxlY3QgYW55IHNlbGVjdGVkIHJlY29yZCBiYXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDM2NQorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNDc4Njg0MjY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkQmFyLmpzOgorICAgICAg ICAoV0kuVGltZWxpbmVSZWNvcmRCYXIucHJvdG90eXBlLl9oYW5kbGVDbGljayk6CisgICAgICAg IE1hcmsgdGhlICJjbGljayIgZXZlbnQgc28gdGhhdCBsYXRlciBsaXN0ZW5lcnMga25vdyBpdCB3 YXMgaGFuZGxlZCBieSBgV0kuVGltZWxpbmVSZWNvcmRCYXJgLgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzOgorICAgICAgICAoV0kuVGltZWxpbmVP dmVydmlldyk6CisgICAgICAgIChXSS5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlwZS5faW5zdHJ1 bWVudEFkZGVkKToKKyAgICAgICAgKFdJLlRpbWVsaW5lT3ZlcnZpZXcucHJvdG90eXBlLl9pbnN0 cnVtZW50UmVtb3ZlZCk6CisgICAgICAgIChXSS5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlwZS5f aGFuZGxlR3JhcGhzQ29udGFpbmVyQ2xpY2spOiBBZGRlZC4KKyAgICAgICAgKFdJLlRpbWVsaW5l T3ZlcnZpZXcucHJvdG90eXBlLl9oYW5kbGVPdmVydmlld0dyYXBoUmVjb3JkU2VsZWN0ZWQpOiBB ZGRlZC4KKyAgICAgICAgKFdJLlRpbWVsaW5lT3ZlcnZpZXcucHJvdG90eXBlLl9yZWNvcmRTZWxl Y3RlZCk6CisgICAgICAgIExpc3RlbiBmb3IgImNsaWNrIiBvbiB0aGUgZ3JhcGggY29udGFpbmVy IGFuZCBkZXNlbGVjdCBhbGwgcmVjb3JkcyB3aGVuIGZpcmVkLCB1bmxlc3MgdGhlCisgICAgICAg IGNsaWNrIHdhcyBtYXJrZWQgYnkgYSBgV0kuVGltZWxpbmVSZWNvcmRCYXJgLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzOgor ICAgICAgICAoV0kuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUuX3JlY29y ZFNlbGVjdGVkKToKKyAgICAgICAgRW5zdXJlIHRoYXQgYWxsIGBXSS5UaW1lbGluZVZpZXdgIHVw ZGF0ZSB0aGVpciBzZWxlY3RlZCByZWNvcmQgd2hlbmV2ZXIgaXQgY2hhbmdlcyBmb3IgYW55Cisg ICAgICAgIG90aGVyIGBXSS5UaW1lbGluZVZpZXdgIChvciBpZiB0aGVyZSBpcyBubyBzZWxlY3Rl ZCByZWNvcmQpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2 aWV3R3JhcGguanM6CisgICAgICAgIChXSS5UaW1lbGluZU92ZXJ2aWV3R3JhcGgucHJvdG90eXBl LmRpZExheW91dFN1YnRyZWUpOiBBZGRlZC4KKyAgICAgICAgRHJpdmUtYnk6IHNpbmNlIGBXSS5U aW1lbGluZVJlY29yZEJhcmAgYXJlIHJldXNlZCB3aGVuIGNvbWJpbmluZywgd2UgbmVlZCB0byBy ZS1kZXRlcm1pbmUKKyAgICAgICAgd2hpY2ggb25lIGhvbGRzIHRoZSBjdXJyZW50bHkgc2VsZWN0 ZWQgcmVjb3JkLgorCiAyMDE5LTAyLTA2ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv bT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBET006IGRvbid0IHNlbmQgdGhlIGVudGlyZSBm dW5jdGlvbiBzdHJpbmcgd2l0aCBlYWNoIGV2ZW50IGxpc3RlbmVyCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3Lmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVy dmlldy5qcwppbmRleCBmNjg1YzU0Yjk0ZWI1ODg1MDJmZTVlYWZlZDRhNjExNTdmNjY2NjA5Li41 Yzc5YzYwOGUzNzIzZmY3NTY5MDk4OGU0MDA4OTgwZDkzNjNiNDU3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3Lmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5l T3ZlcnZpZXcuanMKQEAgLTUzLDYgKzUzLDcgQEAgV0kuVGltZWxpbmVPdmVydmlldyA9IGNsYXNz IFRpbWVsaW5lT3ZlcnZpZXcgZXh0ZW5kcyBXSS5WaWV3CiAKICAgICAgICAgdGhpcy5fZ3JhcGhz Q29udGFpbmVyVmlldyA9IG5ldyBXSS5WaWV3OwogICAgICAgICB0aGlzLl9ncmFwaHNDb250YWlu ZXJWaWV3LmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiZ3JhcGhzLWNvbnRhaW5lciIpOworICAgICAg ICB0aGlzLl9ncmFwaHNDb250YWluZXJWaWV3LmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xp Y2siLCB0aGlzLl9oYW5kbGVHcmFwaHNDb250YWluZXJDbGljay5iaW5kKHRoaXMpKTsKICAgICAg ICAgdGhpcy5hZGRTdWJ2aWV3KHRoaXMuX2dyYXBoc0NvbnRhaW5lclZpZXcpOwogCiAgICAgICAg IHRoaXMuX3NlbGVjdGVkVGltZWxpbmVSZWNvcmQgPSBudWxsOwpAQCAtNjM2LDcgKzYzNyw3IEBA IFdJLlRpbWVsaW5lT3ZlcnZpZXcgPSBjbGFzcyBUaW1lbGluZU92ZXJ2aWV3IGV4dGVuZHMgV0ku VmlldwogICAgICAgICB0aGlzLl90cmVlRWxlbWVudHNCeVR5cGVNYXAuc2V0KHRpbWVsaW5lLnR5 cGUsIHRyZWVFbGVtZW50KTsKIAogICAgICAgICBsZXQgb3ZlcnZpZXdHcmFwaCA9IFdJLlRpbWVs aW5lT3ZlcnZpZXdHcmFwaC5jcmVhdGVGb3JUaW1lbGluZSh0aW1lbGluZSwgdGhpcyk7Ci0gICAg ICAgIG92ZXJ2aWV3R3JhcGguYWRkRXZlbnRMaXN0ZW5lcihXSS5UaW1lbGluZU92ZXJ2aWV3R3Jh cGguRXZlbnQuUmVjb3JkU2VsZWN0ZWQsIHRoaXMuX3JlY29yZFNlbGVjdGVkLCB0aGlzKTsKKyAg ICAgICAgb3ZlcnZpZXdHcmFwaC5hZGRFdmVudExpc3RlbmVyKFdJLlRpbWVsaW5lT3ZlcnZpZXdH cmFwaC5FdmVudC5SZWNvcmRTZWxlY3RlZCwgdGhpcy5faGFuZGxlT3ZlcnZpZXdHcmFwaFJlY29y ZFNlbGVjdGVkLCB0aGlzKTsKICAgICAgICAgdGhpcy5fb3ZlcnZpZXdHcmFwaHNCeVR5cGVNYXAu c2V0KHRpbWVsaW5lLnR5cGUsIG92ZXJ2aWV3R3JhcGgpOwogICAgICAgICB0aGlzLl9ncmFwaHND b250YWluZXJWaWV3Lmluc2VydFN1YnZpZXdCZWZvcmUob3ZlcnZpZXdHcmFwaCwgdGhpcy5fZ3Jh cGhzQ29udGFpbmVyVmlldy5zdWJ2aWV3c1tpbnNlcnRpb25JbmRleF0pOwogCkBAIC02NjIsNyAr NjYzLDcgQEAgV0kuVGltZWxpbmVPdmVydmlldyA9IGNsYXNzIFRpbWVsaW5lT3ZlcnZpZXcgZXh0 ZW5kcyBXSS5WaWV3CiAgICAgICAgIGxldCBzaG91bGRTdXBwcmVzc1NlbGVjdFNpYmxpbmcgPSB0 cnVlOwogICAgICAgICB0aGlzLl90aW1lbGluZXNUcmVlT3V0bGluZS5yZW1vdmVDaGlsZCh0cmVl RWxlbWVudCwgc2hvdWxkU3VwcHJlc3NPbkRlc2VsZWN0LCBzaG91bGRTdXBwcmVzc1NlbGVjdFNp YmxpbmcpOwogCi0gICAgICAgIG92ZXJ2aWV3R3JhcGgucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5U aW1lbGluZU92ZXJ2aWV3R3JhcGguRXZlbnQuUmVjb3JkU2VsZWN0ZWQsIHRoaXMuX3JlY29yZFNl bGVjdGVkLCB0aGlzKTsKKyAgICAgICAgb3ZlcnZpZXdHcmFwaC5yZW1vdmVFdmVudExpc3RlbmVy KFdJLlRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5FdmVudC5SZWNvcmRTZWxlY3RlZCwgdGhpcy5faGFu ZGxlT3ZlcnZpZXdHcmFwaFJlY29yZFNlbGVjdGVkLCB0aGlzKTsKICAgICAgICAgdGhpcy5fZ3Jh cGhzQ29udGFpbmVyVmlldy5yZW1vdmVTdWJ2aWV3KG92ZXJ2aWV3R3JhcGgpOwogCiAgICAgICAg IHRoaXMuX292ZXJ2aWV3R3JhcGhzQnlUeXBlTWFwLmRlbGV0ZSh0aW1lbGluZS50eXBlKTsKQEAg LTY3NCw2ICs2NzUsMTUgQEAgV0kuVGltZWxpbmVPdmVydmlldyA9IGNsYXNzIFRpbWVsaW5lT3Zl cnZpZXcgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIHRoaXMuX3RpbWVsaW5lUnVsZXIuYWRkTWFy a2VyKGV2ZW50LmRhdGEubWFya2VyKTsKICAgICB9CiAKKyAgICBfaGFuZGxlR3JhcGhzQ29udGFp bmVyQ2xpY2soZXZlbnQpCisgICAgeworICAgICAgICAvLyBTZXQgd2hlbiBhIFdJLlRpbWVsaW5l UmVjb3JkQmFyIHJlY2VpdmVzIHRoZSAiY2xpY2siIGZpcnN0IGFuZCBpcyBhYm91dCB0byBiZSBz ZWxlY3RlZC4KKyAgICAgICAgaWYgKGV2ZW50Ll9fdGltZWxpbmVSZWNvcmRCYXJDbGljaykKKyAg ICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLl9yZWNvcmRTZWxlY3RlZChudWxsLCBu dWxsKTsKKyAgICB9CisKICAgICBfdGltZWxpbmVSdWxlck1vdXNlRG93bihldmVudCkKICAgICB7 CiAgICAgICAgIHRoaXMuX3RpbWVsaW5lUnVsZXJTZWxlY3Rpb25DaGFuZ2VkID0gZmFsc2U7CkBA IC03MTAsMTMgKzcyMCwyMyBAQCBXSS5UaW1lbGluZU92ZXJ2aWV3ID0gY2xhc3MgVGltZWxpbmVP dmVydmlldyBleHRlbmRzIFdJLlZpZXcKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0 ZW5lcnMoV0kuVGltZWxpbmVPdmVydmlldy5FdmVudC5UaW1lUmFuZ2VTZWxlY3Rpb25DaGFuZ2Vk KTsKICAgICB9CiAKLSAgICBfcmVjb3JkU2VsZWN0ZWQoZXZlbnQpCisgICAgX2hhbmRsZU92ZXJ2 aWV3R3JhcGhSZWNvcmRTZWxlY3RlZChldmVudCkKICAgICB7CiAgICAgICAgIGxldCB7cmVjb3Jk LCByZWNvcmRCYXJ9ID0gZXZlbnQuZGF0YTsKLSAgICAgICAgaWYgKCFyZWNvcmQgfHwgcmVjb3Jk ID09PSB0aGlzLl9zZWxlY3RlZFRpbWVsaW5lUmVjb3JkKQorCisgICAgICAgIC8vIElnbm9yZSBk ZXNlbGVjdGlvbiBldmVudHMsIGFzIHRoZXkgYXJlIGhhbmRsZWQgYnkgdGhlIG5ld2x5IHNlbGVj dGVkIHJlY29yZCdzIHRpbWVsaW5lLgorICAgICAgICBpZiAoIXJlY29yZCkKICAgICAgICAgICAg IHJldHVybjsKIAotICAgICAgICBpZiAodGhpcy5fc2VsZWN0ZWRUaW1lbGluZVJlY29yZCAmJiB0 aGlzLl9zZWxlY3RlZFRpbWVsaW5lUmVjb3JkLnR5cGUgIT09IHJlY29yZC50eXBlKSB7CisgICAg ICAgIHRoaXMuX3JlY29yZFNlbGVjdGVkKHJlY29yZCwgcmVjb3JkQmFyKTsKKyAgICB9CisKKyAg ICBfcmVjb3JkU2VsZWN0ZWQocmVjb3JkLCByZWNvcmRCYXIpCisgICAgeworICAgICAgICBpZiAo cmVjb3JkID09PSB0aGlzLl9zZWxlY3RlZFRpbWVsaW5lUmVjb3JkKQorICAgICAgICAgICAgcmV0 dXJuOworCisgICAgICAgIGlmICh0aGlzLl9zZWxlY3RlZFRpbWVsaW5lUmVjb3JkICYmICghcmVj b3JkIHx8IHRoaXMuX3NlbGVjdGVkVGltZWxpbmVSZWNvcmQudHlwZSAhPT0gcmVjb3JkLnR5cGUp KSB7CiAgICAgICAgICAgICBsZXQgdGltZWxpbmVPdmVydmlld0dyYXBoID0gdGhpcy5fb3ZlcnZp ZXdHcmFwaHNCeVR5cGVNYXAuZ2V0KHRoaXMuX3NlbGVjdGVkVGltZWxpbmVSZWNvcmQudHlwZSk7 CiAgICAgICAgICAgICBjb25zb2xlLmFzc2VydCh0aW1lbGluZU92ZXJ2aWV3R3JhcGgpOwogICAg ICAgICAgICAgaWYgKHRpbWVsaW5lT3ZlcnZpZXdHcmFwaCkKQEAgLTczNCw3ICs3NTQsNyBAQCBX SS5UaW1lbGluZU92ZXJ2aWV3ID0gY2xhc3MgVGltZWxpbmVPdmVydmlldyBleHRlbmRzIFdJLlZp ZXcKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgbGV0IHN0YXJ0VGltZSA9IGZpcnN0UmVj b3JkIGluc3RhbmNlb2YgV0kuUmVuZGVyaW5nRnJhbWVUaW1lbGluZVJlY29yZCA/IGZpcnN0UmVj b3JkLmZyYW1lSW5kZXggOiBmaXJzdFJlY29yZC5zdGFydFRpbWU7Ci0gICAgICAgICAgICBsZXQg ZW5kVGltZSA9IGxhc3RSZWNvcmQgaW5zdGFuY2VvZiBXSS5SZW5kZXJpbmdGcmFtZVRpbWVsaW5l UmVjb3JkID8gbGFzdFJlY29yZC5mcmFtZUluZGV4IDogbGFzdFJlY29yZC5zdGFydFRpbWU7Cisg ICAgICAgICAgICBsZXQgZW5kVGltZSA9IGxhc3RSZWNvcmQgaW5zdGFuY2VvZiBXSS5SZW5kZXJp bmdGcmFtZVRpbWVsaW5lUmVjb3JkID8gbGFzdFJlY29yZC5mcmFtZUluZGV4IDogbGFzdFJlY29y ZC5lbmRUaW1lOwogCiAgICAgICAgICAgICBpZiAoc3RhcnRUaW1lIDwgdGhpcy5zZWxlY3Rpb25T dGFydFRpbWUgfHwgZW5kVGltZSA+IHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lICsgdGhpcy5zZWxl Y3Rpb25EdXJhdGlvbikgewogICAgICAgICAgICAgICAgIGxldCBzZWxlY3Rpb25QYWRkaW5nID0g dGhpcy5zZWNvbmRzUGVyUGl4ZWwgKiAxMDsKQEAgLTc0MywxNSArNzYzLDcgQEAgV0kuVGltZWxp bmVPdmVydmlldyA9IGNsYXNzIFRpbWVsaW5lT3ZlcnZpZXcgZXh0ZW5kcyBXSS5WaWV3CiAgICAg ICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICBmb3IgKGxldCBbdHlwZSwgb3ZlcnZpZXdH cmFwaF0gb2YgdGhpcy5fb3ZlcnZpZXdHcmFwaHNCeVR5cGVNYXApIHsKLSAgICAgICAgICAgIGlm IChvdmVydmlld0dyYXBoICE9PSBldmVudC50YXJnZXQpCi0gICAgICAgICAgICAgICAgY29udGlu dWU7Ci0KLSAgICAgICAgICAgIGxldCB0aW1lbGluZSA9IHRoaXMuX3JlY29yZGluZy50aW1lbGlu ZXMuZ2V0KHR5cGUpOwotICAgICAgICAgICAgY29uc29sZS5hc3NlcnQodGltZWxpbmUsICJUaW1l bGluZSByZWNvcmRpbmcgbWlzc2luZyB0aW1lbGluZSB0eXBlIiwgdHlwZSk7Ci0gICAgICAgICAg ICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXSS5UaW1lbGluZU92ZXJ2aWV3LkV2ZW50 LlJlY29yZFNlbGVjdGVkLCB7dGltZWxpbmUsIHJlY29yZDogdGhpcy5fc2VsZWN0ZWRUaW1lbGlu ZVJlY29yZH0pOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9CisgICAgICAgIHRoaXMu ZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdJLlRpbWVsaW5lT3ZlcnZpZXcuRXZlbnQuUmVjb3Jk U2VsZWN0ZWQsIHtyZWNvcmQ6IHRoaXMuX3NlbGVjdGVkVGltZWxpbmVSZWNvcmR9KTsKICAgICB9 CiAKICAgICBfcmVzZXRTZWxlY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlld0dyYXBoLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlld0dyYXBo LmpzCmluZGV4IDFlOWYyZjFhN2U2MWVkNGMyNzM1NDUzNWY5YzllMzdjM2RmZjlkNDguLjMxNzM1 M2FkYmYwYzAxZjU4MTY4N2YyZDhlM2M3YTc2YmExZTg4YzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXdHcmFwaC5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGlu ZU92ZXJ2aWV3R3JhcGguanMKQEAgLTI1Myw2ICsyNTMsMTMgQEAgV0kuVGltZWxpbmVPdmVydmll d0dyYXBoID0gY2xhc3MgVGltZWxpbmVPdmVydmlld0dyYXBoIGV4dGVuZHMgV0kuVmlldwogICAg ICAgICBzdXBlci5uZWVkc0xheW91dCgpOwogICAgIH0KIAorICAgIGRpZExheW91dFN1YnRyZWUo KQorICAgIHsKKyAgICAgICAgc3VwZXIuZGlkTGF5b3V0U3VidHJlZSgpOworCisgICAgICAgIHRo aXMudXBkYXRlU2VsZWN0ZWRSZWNvcmQoKTsKKyAgICB9CisKICAgICAvLyBUaW1lbGluZVJlY29y ZEJhciBkZWxlZ2F0ZQogCiAgICAgdGltZWxpbmVSZWNvcmRCYXJDbGlja2VkKHRpbWVsaW5lUmVj b3JkQmFyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVGltZWxpbmVSZWNvcmRCYXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZEJhci5qcwppbmRleCBmMTg4NWFmZTk5ZDUxYWUz YTk3OGYzMWQ4OWM2ZDZlMGQwMGJkNDAxLi4wZGMyZDYyNzBjNTBhYzhmMDQyNDA2NWVhNTljNTcw YzdmMGQ3YmZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UaW1lbGluZVJlY29yZEJhci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZEJhci5qcwpAQCAtMzg4LDYgKzM4OCw5 IEBAIFdJLlRpbWVsaW5lUmVjb3JkQmFyID0gY2xhc3MgVGltZWxpbmVSZWNvcmRCYXIgZXh0ZW5k cyBXSS5PYmplY3QKIAogICAgIF9oYW5kbGVDbGljayhldmVudCkKICAgICB7CisgICAgICAgIC8v IEVuc3VyZSB0aGF0IHRoZSBjb250YWluZXIgImNsaWNrIiBsaXN0ZW5lciBhZGRlZCBieSBgV0ku VGltZWxpbmVPdmVydmlld2AgaXNuJ3QgY2FsbGVkLgorICAgICAgICBldmVudC5fX3RpbWVsaW5l UmVjb3JkQmFyQ2xpY2sgPSB0cnVlOworCiAgICAgICAgIGlmICh0aGlzLl9kZWxlZ2F0ZS50aW1l bGluZVJlY29yZEJhckNsaWNrZWQpCiAgICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS50aW1lbGlu ZVJlY29yZEJhckNsaWNrZWQodGhpcyk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmll dy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5l UmVjb3JkaW5nQ29udGVudFZpZXcuanMKaW5kZXggYTU2MTU4NzBmNzI3MjIzNjUyOTUyNzI3Nzc1 ZjIwNmMwOTQzYTY5Ny4uNGM3MDUwNTkyNmJkYmViM2Q4NjY3NTQ2MTM2N2Y1OTcyNjliMDEyZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGlt ZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzCkBAIC02 OTcsMTMgKzY5NywxNyBAQCBXSS5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3ID0gY2xhc3Mg VGltZWxpbmVSZWNvcmRpbmdDb250ZW50VmlldyBleHRlbmRzIFdJLgogCiAgICAgX3JlY29yZFNl bGVjdGVkKGV2ZW50KQogICAgIHsKLSAgICAgICAgbGV0IHtyZWNvcmQsIHRpbWVsaW5lfSA9IGV2 ZW50LmRhdGE7Ci0gICAgICAgIGxldCB0aW1lbGluZVZpZXcgPSB0aGlzLl90aW1lbGluZVZpZXdN YXAuZ2V0KHRpbWVsaW5lKTsKKyAgICAgICAgbGV0IHtyZWNvcmR9ID0gZXZlbnQuZGF0YTsKIAot ICAgICAgICBpZiAocmVjb3JkICYmIHRpbWVsaW5lVmlldyAhPT0gdGhpcy5jdXJyZW50VGltZWxp bmVWaWV3KQotICAgICAgICAgICAgdGhpcy5zaG93VGltZWxpbmVWaWV3Rm9yVGltZWxpbmUodGlt ZWxpbmUpOworICAgICAgICBmb3IgKGxldCB0aW1lbGluZVZpZXcgb2YgdGhpcy5fdGltZWxpbmVW aWV3TWFwLnZhbHVlcygpKSB7CisgICAgICAgICAgICBsZXQgcmVjb3JkTWF0Y2hlc1RpbWVsaW5l ID0gcmVjb3JkICYmIHRpbWVsaW5lVmlldy5yZXByZXNlbnRlZE9iamVjdC50eXBlID09PSByZWNv cmQudHlwZTsKIAotICAgICAgICB0aW1lbGluZVZpZXcuc2VsZWN0UmVjb3JkKHJlY29yZCk7Cisg ICAgICAgICAgICBpZiAocmVjb3JkTWF0Y2hlc1RpbWVsaW5lICYmIHRpbWVsaW5lVmlldyAhPT0g dGhpcy5jdXJyZW50VGltZWxpbmVWaWV3KQorICAgICAgICAgICAgICAgIHRoaXMuc2hvd1RpbWVs aW5lVmlld0ZvclRpbWVsaW5lKHRpbWVsaW5lVmlldy5yZXByZXNlbnRlZE9iamVjdCk7CisKKyAg ICAgICAgICAgIGlmICghcmVjb3JkIHx8IHJlY29yZE1hdGNoZXNUaW1lbGluZSkKKyAgICAgICAg ICAgICAgICB0aW1lbGluZVZpZXcuc2VsZWN0UmVjb3JkKHJlY29yZCk7CisgICAgICAgIH0KICAg ICB9CiAKICAgICBfdGltZWxpbmVTZWxlY3RlZCgpCg==