147236 2015-07-23 13:33:41 -0700 Web Inspector: TimelineOverview scroll container eats mouse events due to its large z-index 2026-01-12 09:01:26 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All NEW https://bugs.webkit.org/show_bug.cgi?id=160743 InRadar P2 Normal --- 1 mattbaker mattbaker graouts inspector-bugzilla-changes jonowells webkit-bug-importer oldest_to_newest 1111721 0 mattbaker 2015-07-23 13:33:41 -0700 * SUMMARY TimelineOverview scroll container eats mouse events due to its large z-index. The bottom 16px of the TimelineOverview cannot respond to mouse events to create ruler selections or click on graph records. * NOTES Scroll container needs to get first crack at scroll events, thus the high z-index. But we should look at forwarding other mouse events to underlying elements. 1136321 1 263992 mattbaker 2015-10-24 17:53:01 -0700 Created attachment 263992 [Patch] Proposed Fix 1136322 2 webkit-bug-importer 2015-10-24 17:53:19 -0700 <rdar://problem/23249409> 1137182 3 263992 bburg 2015-10-28 10:46:22 -0700 Comment on attachment 263992 [Patch] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=263992&action=review r- because it doesn't fix the bug when I tested it. I can't make a selection by starting the drag where the scroll bar is positioned. When I look at the DOM, removing the z-index on the scroll container allows me to make the selection but not interact with a visible scroll bar. Is it possible that we can pump up the z-index only when the scroll bar is visible and being hovered? > Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js:435 > + if (!(event.pageX >= graphRect.left && event.pageX <= graphRect.right && event.pageY >= graphRect.top && event.pageY <= graphRect.bottom)) Please use WebInspector.Rect.prototype.intersectionWithRect and friends. 1137245 4 mattbaker 2015-10-28 13:24:13 -0700 (In reply to comment #3) > Comment on attachment 263992 [details] > [Patch] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=263992&action=review > > r- because it doesn't fix the bug when I tested it. I can't make a selection > by starting the drag where the scroll bar is positioned. Yikes! I was just checking that I could click within the ruler to select frames, which wasn't previously possible either without a hack. > When I look at the DOM, removing the z-index on the scroll container allows > me to make the selection but not interact with a visible scroll bar. Is it > possible that we can pump up the z-index only when the scroll bar is visible > and being hovered? I'll look into this. > > Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js:435 > > + if (!(event.pageX >= graphRect.left && event.pageX <= graphRect.right && event.pageY >= graphRect.top && event.pageY <= graphRect.bottom)) > > Please use WebInspector.Rect.prototype.intersectionWithRect and friends. Will do. 1137246 5 mattbaker 2015-10-28 13:24:54 -0700 (In reply to comment #4) > (In reply to comment #3) > > Comment on attachment 263992 [details] > > [Patch] Proposed Fix > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=263992&action=review > > > > r- because it doesn't fix the bug when I tested it. I can't make a selection > > by starting the drag where the scroll bar is positioned. > > Yikes! I was just checking that I could click within the ruler to select > frames, which wasn't previously possible either without a hack. I meant click within the scrollbar. 263992 2015-10-24 17:53:01 -0700 2015-10-28 10:46:22 -0700 [Patch] Proposed Fix bug-147236-20151024175214.patch text/plain 7779 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxNTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBm ODQ3MjVjODFkNzU5MmM2NTE5YzI0YTliMGMwNTNlODY5NzllN2U2Li4wZjIzZjdiOTU5MTRmMWMw YWRjYjM5MDZiNWYwY2Y5MGJmMGM2ODMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMSBAQAorMjAxNS0xMC0yNCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVGltZWxpbmVPdmVydmlldyBzY3JvbGwgY29udGFp bmVyIGVhdHMgbW91c2UgZXZlbnRzIGR1ZSB0byBpdHMgbGFyZ2Ugei1pbmRleAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MjM2CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wcm92ZWQgY2xpY2sgaGFu ZGxpbmcgaW4gdGhlIG92ZXJ2aWV3IGdyYXBoIHNvIHRoYXQgcnVsZXIgYW5kIHNjcm9sbCBjb250 YWluZXIgZWxlbWVudHMKKyAgICAgICAgZG9uJ3QgaW50ZXJmZXJlIHdpdGggc2VsZWN0aW5nIHJl bmRlcmluZyBmcmFtZSBlbGVtZW50cy4gQWxzbyBuZWVkZWQgZm9yIGZ1dHVyZSBvdmVydmlldwor ICAgICAgICBncmFwaHMgcmVxdWlyaW5nIGNsaWNrIHN1cHBvcnQuCisKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGltZWxpbmVPdmVydmlldyk6CisgICAgICAgIEFkZGVkIGNsaWNrIGV2ZW50IGxpc3RlbmVy IG9uIHZpZXcgZWxlbWVudCwgaGFuZGxlcyBjbGlja3Mgb3ZlciB0aGUgcnVsZXIgYW5kIHNjcm9s bCBjb250YWluZXIuCisgICAgICAgIFJlbW92ZWQgVGltZWxpbmVSdWxlciBldmVudCBsaXN0ZW5l cnMuIE5vIGxvbmdlciBuZWVkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVy dmlldy5wcm90b3R5cGUuX2hhbmRsZUNsaWNrRXZlbnQpOgorICAgICAgICBNb3ZlZCBmb3J3YXJk aW5nIG9mIGNsaWNrIGV2ZW50cyB0byBjaGlsZCBvdmVydmlldyBncmFwaHMuCisgICAgICAgIChX ZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5faGFuZGxlV2hlZWxFdmVudCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUuX3RpbWVSYW5nZVNlbGVj dGlvbkNoYW5nZWQpOgorICAgICAgICBTZXRzIGZsYWcgdG8gaWdub3JlIG5leHQgY2xpY2suCisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUuX2hhbmRsZVdo ZWVsRXZlbnQpOgorICAgICAgICBVc2UgY2xvbmVkIHN5bWJvbC4KKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlwZS5fdGltZWxpbmVSdWxlck1vdXNlRG93bik6 IERlbGV0ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90b3R5 cGUuX3RpbWVsaW5lUnVsZXJNb3VzZUNsaWNrZWQpOiBEZWxldGVkLgorICAgICAgICBObyBsb25n ZXIgbmVlZGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcuX3RpbWVS YW5nZVNlbGVjdGlvbkNoYW5nZWQpOiBEZWxldGVkLgorICAgICAgICBObyBsb25nZXIgbmVlZGVk LiBUaGUgY2xpY2sgaGFuZGxlciBzaG91bGQgcmVzZXQgdGhlIGlnbm9yZSBuZXh0IGNsaWNrIGZs YWcuCisKIDIwMTUtMTAtMjMgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSZW1vdmUgdW51c2VkIFNjcm9sbExheWVyIFRpbWVs aW5lIEV2ZW50VHlwZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuanMKaW5kZXggN2Q4MzQyMjlmOTY3 NzM3ZTZkYjQ0OGY2MDNlZDMyMjJjYWYyN2Q5OC4uNjk4NzFhYzI4NzU3MDVjZTQ5NGI1NDY3MzRh MWU2ZGU3ZGQ2ZWJlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzCkBAIC0zNSw2ICszNSw3 IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3ID0gY2xhc3MgVGltZWxpbmVPdmVydmll dyBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplCiAKICAgICAgICAgdGhpcy5fZWxlbWVudCA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNz TGlzdC5hZGQoInRpbWVsaW5lLW92ZXJ2aWV3IiwgaWRlbnRpZmllcik7CisgICAgICAgIHRoaXMu X2VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9oYW5kbGVDbGlja0V2ZW50 LmJpbmQodGhpcykpOwogICAgICAgICB0aGlzLl9lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIndo ZWVsIiwgdGhpcy5faGFuZGxlV2hlZWxFdmVudC5iaW5kKHRoaXMpKTsKIAogICAgICAgICB0aGlz Ll9ncmFwaHNDb250YWluZXJFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7 CkBAIC00Niw4ICs0Nyw2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3ID0gY2xhc3Mg VGltZWxpbmVPdmVydmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplCiAgICAgICAgIHRoaXMu X3RpbWVsaW5lUnVsZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXI7CiAgICAgICAg IHRoaXMuX3RpbWVsaW5lUnVsZXIuYWxsb3dzQ2xpcHBlZExhYmVscyA9IHRydWU7CiAgICAgICAg IHRoaXMuX3RpbWVsaW5lUnVsZXIuYWxsb3dzVGltZVJhbmdlU2VsZWN0aW9uID0gdHJ1ZTsKLSAg ICAgICAgdGhpcy5fdGltZWxpbmVSdWxlci5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNl ZG93biIsIHRoaXMuX3RpbWVsaW5lUnVsZXJNb3VzZURvd24uYmluZCh0aGlzKSk7Ci0gICAgICAg IHRoaXMuX3RpbWVsaW5lUnVsZXIuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRo aXMuX3RpbWVsaW5lUnVsZXJNb3VzZUNsaWNrZWQuYmluZCh0aGlzKSk7CiAgICAgICAgIHRoaXMu X3RpbWVsaW5lUnVsZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxl ci5FdmVudC5UaW1lUmFuZ2VTZWxlY3Rpb25DaGFuZ2VkLCB0aGlzLl90aW1lUmFuZ2VTZWxlY3Rp b25DaGFuZ2VkLCB0aGlzKTsKICAgICAgICAgdGhpcy5fZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlz Ll90aW1lbGluZVJ1bGVyLmVsZW1lbnQpOwogCkBAIC03OSw3ICs3OCw3IEBAIFdlYkluc3BlY3Rv ci5UaW1lbGluZU92ZXJ2aWV3ID0gY2xhc3MgVGltZWxpbmVPdmVydmlldyBleHRlbmRzIFdlYklu c3BlY3Rvci5PYmplCiAgICAgICAgIHRoaXMuX21vdXNlV2hlZWxEZWx0YSA9IDA7CiAgICAgICAg IHRoaXMuX3Njcm9sbFN0YXJ0VGltZSA9IDA7CiAgICAgICAgIHRoaXMuX2NhY2hlZFNjcm9sbENv bnRhaW5lcldpZHRoID0gTmFOOwotICAgICAgICB0aGlzLl90aW1lbGluZVJ1bGVyU2VsZWN0aW9u Q2hhbmdlZCA9IGZhbHNlOworICAgICAgICB0aGlzLl9zaG91bGRJZ25vcmVOZXh0Q2xpY2tFdmVu dCA9IGZhbHNlOwogCiAgICAgICAgIHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lID0gdGhpcy5fc2Vs ZWN0aW9uU3RhcnRWYWx1ZVNldHRpbmcudmFsdWU7CiAgICAgICAgIHRoaXMuc2VsZWN0aW9uRHVy YXRpb24gPSB0aGlzLl9zZWxlY3Rpb25EdXJhdGlvblNldHRpbmcudmFsdWU7CkBAIC00MjAsMTgg KzQxOSw0MiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldyA9IGNsYXNzIFRpbWVsaW5l T3ZlcnZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZQogICAgICAgICB0aGlzLl9kb250VXBk YXRlU2Nyb2xsTGVmdCA9IGZhbHNlOwogICAgIH0KIAorICAgIF9oYW5kbGVDbGlja0V2ZW50KGV2 ZW50KQorICAgIHsKKyAgICAgICAgLy8gSWdub3JlIGNsb25lZCBldmVudHMgdGhhdCBjb21lIG91 ciB3YXksIHdlIGFscmVhZHkgaGFuZGxlZCB0aGUgb3JpZ2luYWwuCisgICAgICAgIGlmIChldmVu dFtXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5DbG9uZWRFdmVudFN5bWJvbF0pCisgICAg ICAgICAgICByZXR1cm47CisKKyAgICAgICAgaWYgKHRoaXMuX3Nob3VsZElnbm9yZU5leHRDbGlj a0V2ZW50KSB7CisgICAgICAgICAgICB0aGlzLl9zaG91bGRJZ25vcmVOZXh0Q2xpY2tFdmVudCA9 IGZhbHNlOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgZm9yIChs ZXQgb3ZlcnZpZXdHcmFwaCBvZiB0aGlzLl90aW1lbGluZU92ZXJ2aWV3R3JhcGhzTWFwLnZhbHVl cygpKSB7CisgICAgICAgICAgICBjb25zdCBncmFwaFJlY3QgPSBvdmVydmlld0dyYXBoLmVsZW1l bnQuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7CisgICAgICAgICAgICBpZiAoIShldmVudC5wYWdl WCA+PSBncmFwaFJlY3QubGVmdCAmJiBldmVudC5wYWdlWCA8PSBncmFwaFJlY3QucmlnaHQgJiYg ZXZlbnQucGFnZVkgPj0gZ3JhcGhSZWN0LnRvcCAmJiBldmVudC5wYWdlWSA8PSBncmFwaFJlY3Qu Ym90dG9tKSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgLy8gQ2xv bmUgdGhlIGV2ZW50IHRvIGRpc3BhdGNoIGl0IG9uIHRoZSBvdmVydmlldyBncmFwaCBlbGVtZW50 LgorICAgICAgICAgICAgbGV0IG5ld0NsaWNrRXZlbnQgPSBuZXcgZXZlbnQuY29uc3RydWN0b3Io ZXZlbnQudHlwZSwgZXZlbnQpOworICAgICAgICAgICAgbmV3Q2xpY2tFdmVudFtXZWJJbnNwZWN0 b3IuVGltZWxpbmVPdmVydmlldy5DbG9uZWRFdmVudFN5bWJvbF0gPSB0cnVlOworICAgICAgICAg ICAgb3ZlcnZpZXdHcmFwaC5lbGVtZW50LmRpc3BhdGNoRXZlbnQobmV3Q2xpY2tFdmVudCk7Cisg ICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICB9CisKICAgICBfaGFuZGxlV2hlZWxF dmVudChldmVudCkKICAgICB7CiAgICAgICAgIC8vIElnbm9yZSBjbG9uZWQgZXZlbnRzIHRoYXQg Y29tZSBvdXIgd2F5LCB3ZSBhbHJlYWR5IGhhbmRsZWQgdGhlIG9yaWdpbmFsLgotICAgICAgICBp ZiAoZXZlbnQuX19jbG9uZWQpCisgICAgICAgIGlmIChldmVudFtXZWJJbnNwZWN0b3IuVGltZWxp bmVPdmVydmlldy5DbG9uZWRFdmVudFN5bWJvbF0pCiAgICAgICAgICAgICByZXR1cm47CiAKICAg ICAgICAgLy8gUmVxdWlyZSB0d2ljZSB0aGUgdmVydGljYWwgZGVsdGEgdG8gb3ZlcmNvbWUgaG9y aXpvbnRhbCBzY3JvbGxpbmcuIFRoaXMgcHJldmVudHMgbW9zdAogICAgICAgICAvLyBjYXNlcyBv ZiBpbmFkdmVydGVudCB6b29taW5nIGZvciBzbGlnaHRseSBkaWFnb25hbCBzY3JvbGxzLgogICAg ICAgICBpZiAoTWF0aC5hYnMoZXZlbnQuZGVsdGFYKSA+PSBNYXRoLmFicyhldmVudC5kZWx0YVkp ICogMC41KSB7CiAgICAgICAgICAgICAvLyBDbG9uZSB0aGUgZXZlbnQgdG8gZGlzcGF0Y2ggaXQg b24gdGhlIHNjcm9sbCBjb250YWluZXIuIE1hcmsgaXQgYXMgY2xvbmVkIHNvIHdlIGRvbid0IGdl dCBpbnRvIGEgbG9vcC4KLSAgICAgICAgICAgIHZhciBuZXdXaGVlbEV2ZW50ID0gbmV3IGV2ZW50 LmNvbnN0cnVjdG9yKGV2ZW50LnR5cGUsIGV2ZW50KTsKLSAgICAgICAgICAgIG5ld1doZWVsRXZl bnQuX19jbG9uZWQgPSB0cnVlOworICAgICAgICAgICAgbGV0IG5ld1doZWVsRXZlbnQgPSBuZXcg ZXZlbnQuY29uc3RydWN0b3IoZXZlbnQudHlwZSwgZXZlbnQpOworICAgICAgICAgICAgbmV3V2hl ZWxFdmVudFtXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5DbG9uZWRFdmVudFN5bWJvbF0g PSB0cnVlOwogCiAgICAgICAgICAgICB0aGlzLl9zY3JvbGxDb250YWluZXJFbGVtZW50LmRpc3Bh dGNoRXZlbnQobmV3V2hlZWxFdmVudCk7CiAgICAgICAgICAgICByZXR1cm47CkBAIC00OTQsMzEg KzUxNyw5IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3ID0gY2xhc3MgVGltZWxpbmVP dmVydmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplCiAgICAgICAgIHRoaXMuX2dyYXBoc0Nv bnRhaW5lckVsZW1lbnQucmVtb3ZlQ2hpbGQob3ZlcnZpZXdHcmFwaC5lbGVtZW50KTsKICAgICB9 CiAKLSAgICBfdGltZWxpbmVSdWxlck1vdXNlRG93bihldmVudCkKLSAgICB7Ci0gICAgICAgIHRo aXMuX3RpbWVsaW5lUnVsZXJTZWxlY3Rpb25DaGFuZ2VkID0gZmFsc2U7Ci0gICAgfQotCi0gICAg X3RpbWVsaW5lUnVsZXJNb3VzZUNsaWNrZWQoZXZlbnQpCi0gICAgewotICAgICAgICBpZiAodGhp cy5fdGltZWxpbmVSdWxlclNlbGVjdGlvbkNoYW5nZWQpCi0gICAgICAgICAgICByZXR1cm47Ci0K LSAgICAgICAgZm9yICh2YXIgb3ZlcnZpZXdHcmFwaCBvZiB0aGlzLl90aW1lbGluZU92ZXJ2aWV3 R3JhcGhzTWFwLnZhbHVlcygpKSB7Ci0gICAgICAgICAgICB2YXIgZ3JhcGhSZWN0ID0gb3ZlcnZp ZXdHcmFwaC5lbGVtZW50LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOwotICAgICAgICAgICAgaWYg KCEoZXZlbnQucGFnZVggPj0gZ3JhcGhSZWN0LmxlZnQgJiYgZXZlbnQucGFnZVggPD0gZ3JhcGhS ZWN0LnJpZ2h0ICYmIGV2ZW50LnBhZ2VZID49IGdyYXBoUmVjdC50b3AgJiYgZXZlbnQucGFnZVkg PD0gZ3JhcGhSZWN0LmJvdHRvbSkpCi0gICAgICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAg ICAgICAgIC8vIENsb25lIHRoZSBldmVudCB0byBkaXNwYXRjaCBpdCBvbiB0aGUgb3ZlcnZpZXcg Z3JhcGggZWxlbWVudC4KLSAgICAgICAgICAgIHZhciBuZXdDbGlja0V2ZW50ID0gbmV3IGV2ZW50 LmNvbnN0cnVjdG9yKGV2ZW50LnR5cGUsIGV2ZW50KTsKLSAgICAgICAgICAgIG92ZXJ2aWV3R3Jh cGguZWxlbWVudC5kaXNwYXRjaEV2ZW50KG5ld0NsaWNrRXZlbnQpOwotICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICB9Ci0gICAgfQotCiAgICAgX3RpbWVSYW5nZVNlbGVjdGlvbkNoYW5nZWQo ZXZlbnQpCiAgICAgewotICAgICAgICB0aGlzLl90aW1lbGluZVJ1bGVyU2VsZWN0aW9uQ2hhbmdl ZCA9IHRydWU7CisgICAgICAgIHRoaXMuX3Nob3VsZElnbm9yZU5leHRDbGlja0V2ZW50ID0gdHJ1 ZTsKICAgICAgICAgdGhpcy5fc2VsZWN0aW9uU3RhcnRWYWx1ZVNldHRpbmcudmFsdWUgPSB0aGlz LnNlbGVjdGlvblN0YXJ0VGltZSAtIHRoaXMuX3N0YXJ0VGltZTsKICAgICAgICAgdGhpcy5fc2Vs ZWN0aW9uRHVyYXRpb25TZXR0aW5nLnZhbHVlID0gdGhpcy5zZWxlY3Rpb25EdXJhdGlvbjsKIApA QCAtNTQ0LDYgKzU0NSw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3ID0gY2xhc3Mg VGltZWxpbmVPdmVydmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplCiAgICAgfQogfTsKIAor V2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcuQ2xvbmVkRXZlbnRTeW1ib2wgPSBTeW1ib2wo InRpbWVsaW5lLW92ZXJ2aWV3LWNsb25lZC1ldmVudCIpOworCiBXZWJJbnNwZWN0b3IuVGltZWxp bmVPdmVydmlldy5TY3JvbGxEZWx0YURlbm9taW5hdG9yID0gNTAwOwogCiBXZWJJbnNwZWN0b3Iu VGltZWxpbmVPdmVydmlldy5FdmVudCA9IHsK