155981 2016-03-29 11:38:08 -0700 Web Inspector: REGRESSION: ⌘E and ⌘G text searching does not work 2016-03-29 13:36:38 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1178736 0 joepeck 2016-03-29 11:38:08 -0700 * SUMMARY ⌘E and ⌘G text searching does not work. * STEPS TO REPRODUCE 1. Inspect webkit.org 2. Show main resource 3. Double click "stylesheet" 4. Cmd-E to put into search buffer 5. Cmd-G to search forward => Nothing happens. Expected search forward! 1178737 1 webkit-bug-importer 2016-03-29 11:38:38 -0700 <rdar://problem/25418983> 1178742 2 joepeck 2016-03-29 12:02:17 -0700 This was partially caused by: http://trac.webkit.org/changeset/198603 But mainly the problem is that the RecordingContentView in the background TimelineTab thinks it is visible and has activated its own keyboard shortcut handling: [Log] Trace: enableKeyboardShortcuts enableKeyboardShortcuts (FindBanner.js:253) shown (ContentBrowser.js:262) shown (TimelineRecordingContentView.js:168) prepareToShow (BackForwardEntry.js:78) _showEntry (ContentViewContainer.js:485) showBackForwardEntryForIndex (ContentViewContainer.js:150) showContentView (ContentViewContainer.js:126) _showTimelineViewForType (TimelineTabContentView.js:529) restoreFromCookie (TimelineTabContentView.js:313) _recordingSelected (TimelineTabContentView.js:478) _recordingLoaded (TimelineTabContentView.js:483) TimelineTabContentView (TimelineTabContentView.js:87) _createTabContentViewForType (Main.js:490) contentLoaded (Main.js:416) (anonymous function) Which gets first stab at the keyboard shortcut instead of the actually active tab's keyboard shortcut handling: [Log] Trace: enableKeyboardShortcuts enableKeyboardShortcuts (FindBanner.js:253) shown (ContentBrowser.js:262) shown (ContentBrowserTabContentView.js:98) prepareToShow (BackForwardEntry.js:78) _showEntry (ContentViewContainer.js:485) showBackForwardEntryForIndex (ContentViewContainer.js:150) showContentView (ContentViewContainer.js:126) _tabBarItemSelected (TabBrowser.js:204) dispatch (Object.js:161) dispatchEventToListeners (Object.js:168) selectedTabBarItem (TabBar.js:374) contentLoaded (Main.js:424) (anonymous function) 1178752 3 275119 joepeck 2016-03-29 12:36:44 -0700 Created attachment 275119 [PATCH] Proposed Fix 1178784 4 275119 commit-queue 2016-03-29 13:36:35 -0700 Comment on attachment 275119 [PATCH] Proposed Fix Clearing flags on attachment: 275119 Committed r198794: <http://trac.webkit.org/changeset/198794> 1178785 5 commit-queue 2016-03-29 13:36:38 -0700 All reviewed patches have been landed. Closing bug. 275119 2016-03-29 12:36:44 -0700 2016-03-29 13:36:35 -0700 [PATCH] Proposed Fix fix-find.patch text/plain 8162 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDA3Y2E0NTYuLjBhZjk1ZTYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM4IEBACiAyMDE2LTAzLTI5ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUkVHUkVT U0lPTjog4oyYRSBhbmQg4oyYRyB0ZXh0IHNlYXJjaGluZyBkb2VzIG5vdCB3b3JrCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTU5ODEKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzI1NDE4OTgzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIERpc2FibGUgdGhlIHVudXNlZCBmaW5kIGJhbm5lciBpbiB0aGUg UmVjb3JkaW5nQ29udGVudFZpZXcncworICAgICAgICBDb250ZW50QnJvd3Nlci4gVGhpcyBpcyBh IHdvcmthcm91bmQgZm9yIHRoZSBiYWNrZ3JvdW5kIHRhYgorICAgICAgICB0aGlua2luZyBpdCBp cyB2aXNpYmxlLCBidXQgc3RpbGwgdXNlZnVsIHNpbmNlIHRoZSBmaW5kCisgICAgICAgIGJhbm5l ciB3b3VsZG4ndCBiZSB1c2VkIGluIHRoZSBUaW1lbGluZUNvbnRlbnRWaWV3IGFueXdheXMgc28K KyAgICAgICAgY2FuIGF2b2lkIGJlaW5nIGNyZWF0ZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnRl bnRCcm93c2VyKToKKyAgICAgICAgQWRkIGEgY29uc3RydWN0aW9uIG9wdGlvbiB0byBub3QgY3Jl YXRlIGEgRmluZEJhbm5lci4KKyAgICAgICAgCisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVu dEJyb3dzZXIucHJvdG90eXBlLmhhbmRsZUZpbmRFdmVudCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQ29udGVudEJyb3dzZXIucHJvdG90eXBlLnNob3duKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Db250ZW50QnJvd3Nlci5wcm90b3R5cGUuaGlkZGVuKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Db250ZW50QnJvd3Nlci5wcm90b3R5cGUuX2NvbnRlbnRWaWV3TnVtYmVyT2ZTZWFyY2hSZXN1 bHRzRGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3Nlci5wcm90 b3R5cGUuX3VwZGF0ZUZpbmRCYW5uZXIpOgorICAgICAgICBIYW5kbGUgd2hlbiB3ZSBkb24ndCBo YXZlIGEgZmluZCBiYW5uZXIuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVs aW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxp bmVSZWNvcmRpbmdDb250ZW50Vmlldyk6CisgICAgICAgIERvIG5vdCBjcmVhdGUgYSBGaW5kQmFu bmVyIGluIHRoZSBSZWNvcmRpbmdDb250ZW50Vmlldy4KKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvQmFzZS9NYWluLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQpOgor ICAgICAgICBUaGlzIGdsb2JhbCBjb250ZW50IGJyb3dzZXIgY2FuIGFsc28gYXZvaWQgY3JlYXRp bmcgYSBGaW5kQmFubmVyLgorCisyMDE2LTAzLTI5ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFy b0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogV2Ugc2hvdWxkIGhhdmUgYSB3 YXkgdG8gY2FwdHVyZSBoZWFwIHNuYXBzaG90cyBwcm9ncmFtYXRpY2FsbHkuCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTQ0MDcKICAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzI0NzI2MjkyPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQmFzZS9NYWluLmpzCmluZGV4IDYyZDg4MzkuLjM3NzJhZjQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKQEAgLTIzMSw3 ICsyMzEsNyBAQCBXZWJJbnNwZWN0b3IuY29udGVudExvYWRlZCA9IGZ1bmN0aW9uKCkKICAgICB0 aGlzLl9jb250ZW50RWxlbWVudC5zZXRBdHRyaWJ1dGUoInJvbGUiLCAibWFpbiIpOwogICAgIHRo aXMuX2NvbnRlbnRFbGVtZW50LnNldEF0dHJpYnV0ZSgiYXJpYS1sYWJlbCIsIFdlYkluc3BlY3Rv ci5VSVN0cmluZygiQ29udGVudCIpKTsKIAotICAgIHRoaXMuc3BsaXRDb250ZW50QnJvd3NlciA9 IG5ldyBXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo InNwbGl0LWNvbnRlbnQtYnJvd3NlciIpLCB0aGlzLCB0cnVlKTsKKyAgICB0aGlzLnNwbGl0Q29u dGVudEJyb3dzZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyKGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCJzcGxpdC1jb250ZW50LWJyb3dzZXIiKSwgdGhpcywgdHJ1ZSwgdHJ1ZSk7 CiAgICAgdGhpcy5zcGxpdENvbnRlbnRCcm93c2VyLm5hdmlnYXRpb25CYXIuZWxlbWVudC5hZGRF dmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9jb25zb2xlUmVzaXplck1vdXNlRG93bi5i aW5kKHRoaXMpKTsKIAogICAgIHRoaXMucXVpY2tDb25zb2xlID0gbmV3IFdlYkluc3BlY3Rvci5R dWlja0NvbnNvbGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInF1aWNrLWNvbnNvbGUiKSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250 ZW50QnJvd3Nlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0NvbnRlbnRCcm93c2VyLmpzCmluZGV4IDAxMjViNDQuLjQ4YjczMDIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRC cm93c2VyLmpzCkBAIC0yNSw3ICsyNSw3IEBACiAKIFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3Nl ciA9IGNsYXNzIENvbnRlbnRCcm93c2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKIHsKLSAg ICBjb25zdHJ1Y3RvcihlbGVtZW50LCBkZWxlZ2F0ZSwgZGlzYWJsZUJhY2tGb3J3YXJkKQorICAg IGNvbnN0cnVjdG9yKGVsZW1lbnQsIGRlbGVnYXRlLCBkaXNhYmxlQmFja0ZvcndhcmQsIGRpc2Fi bGVGaW5kQmFubmVyKQogICAgIHsKICAgICAgICAgc3VwZXIoZWxlbWVudCk7CiAKQEAgLTM4LDEw ICszOCw2IEBAIFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlciA9IGNsYXNzIENvbnRlbnRCcm93 c2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAgdGhpcy5fY29udGVudFZpZXdD b250YWluZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuQ29udGVudFZpZXdDb250YWlu ZXIuRXZlbnQuQ3VycmVudENvbnRlbnRWaWV3RGlkQ2hhbmdlLCB0aGlzLl9jdXJyZW50Q29udGVu dFZpZXdEaWRDaGFuZ2UsIHRoaXMpOwogICAgICAgICB0aGlzLmFkZFN1YnZpZXcodGhpcy5fY29u dGVudFZpZXdDb250YWluZXIpOwogCi0gICAgICAgIHRoaXMuX2ZpbmRCYW5uZXIgPSBuZXcgV2Vi SW5zcGVjdG9yLkZpbmRCYW5uZXIodGhpcyk7Ci0gICAgICAgIHRoaXMuX2ZpbmRCYW5uZXIuYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRmluZEJhbm5lci5FdmVudC5EaWRTaG93LCB0aGlz Ll9maW5kQmFubmVyRGlkU2hvdywgdGhpcyk7Ci0gICAgICAgIHRoaXMuX2ZpbmRCYW5uZXIuYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRmluZEJhbm5lci5FdmVudC5EaWRIaWRlLCB0aGlz Ll9maW5kQmFubmVyRGlkSGlkZSwgdGhpcyk7Ci0KICAgICAgICAgaWYgKCFkaXNhYmxlQmFja0Zv cndhcmQpIHsKICAgICAgICAgICAgIHRoaXMuX2JhY2tLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0 Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wgfCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1 dC5Nb2RpZmllci5Db250cm9sLCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuTGVm dCwgdGhpcy5fYmFja0J1dHRvbkNsaWNrZWQuYmluZCh0aGlzKSwgdGhpcy5lbGVtZW50KTsKICAg ICAgICAgICAgIHRoaXMuX2ZvcndhcmRLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rv ci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVy LkNvbW1hbmRPckNvbnRyb2wgfCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmll ci5Db250cm9sLCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuUmlnaHQsIHRoaXMu X2ZvcndhcmRCdXR0b25DbGlja2VkLmJpbmQodGhpcyksIHRoaXMuZWxlbWVudCk7CkBAIC01OSw2 ICs1NSwxMiBAQCBXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIgPSBjbGFzcyBDb250ZW50QnJv d3NlciBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgICAgICB0aGlzLl9uYXZpZ2F0 aW9uQmFyLmFkZE5hdmlnYXRpb25JdGVtKG5ldyBXZWJJbnNwZWN0b3IuRGl2aWRlck5hdmlnYXRp b25JdGVtKTsKICAgICAgICAgfQogCisgICAgICAgIGlmICghZGlzYWJsZUZpbmRCYW5uZXIpIHsK KyAgICAgICAgICAgIHRoaXMuX2ZpbmRCYW5uZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkZpbmRCYW5u ZXIodGhpcyk7CisgICAgICAgICAgICB0aGlzLl9maW5kQmFubmVyLmFkZEV2ZW50TGlzdGVuZXIo V2ViSW5zcGVjdG9yLkZpbmRCYW5uZXIuRXZlbnQuRGlkU2hvdywgdGhpcy5fZmluZEJhbm5lckRp ZFNob3csIHRoaXMpOworICAgICAgICAgICAgdGhpcy5fZmluZEJhbm5lci5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5GaW5kQmFubmVyLkV2ZW50LkRpZEhpZGUsIHRoaXMuX2ZpbmRCYW5u ZXJEaWRIaWRlLCB0aGlzKTsKKyAgICAgICAgfQorCiAgICAgICAgIHRoaXMuX2hpZXJhcmNoaWNh bFBhdGhOYXZpZ2F0aW9uSXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2FsUGF0aE5h dmlnYXRpb25JdGVtOwogICAgICAgICB0aGlzLl9oaWVyYXJjaGljYWxQYXRoTmF2aWdhdGlvbkl0 ZW0uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2FsUGF0aE5hdmlnYXRp b25JdGVtLkV2ZW50LlBhdGhDb21wb25lbnRXYXNTZWxlY3RlZCwgdGhpcy5faGllcmFyY2hpY2Fs UGF0aENvbXBvbmVudFdhc1NlbGVjdGVkLCB0aGlzKTsKICAgICAgICAgdGhpcy5fbmF2aWdhdGlv bkJhci5hZGROYXZpZ2F0aW9uSXRlbSh0aGlzLl9oaWVyYXJjaGljYWxQYXRoTmF2aWdhdGlvbkl0 ZW0pOwpAQCAtMTk3LDYgKzE5OSw5IEBAIFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlciA9IGNs YXNzIENvbnRlbnRCcm93c2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKIAogICAgIGhhbmRs ZUZpbmRFdmVudChldmVudCkKICAgICB7CisgICAgICAgIGlmICghdGhpcy5fZmluZEJhbm5lcikK KyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICB2YXIgY3VycmVudENvbnRlbnRWaWV3ID0g dGhpcy5jdXJyZW50Q29udGVudFZpZXc7CiAgICAgICAgIGlmICghY3VycmVudENvbnRlbnRWaWV3 IHx8ICFjdXJyZW50Q29udGVudFZpZXcuc3VwcG9ydHNTZWFyY2gpCiAgICAgICAgICAgICByZXR1 cm47CkBAIC0yNTksMTQgKzI2NCwxNiBAQCBXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIgPSBj bGFzcyBDb250ZW50QnJvd3NlciBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgewogICAg ICAgICB0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lci5zaG93bigpOwogCi0gICAgICAgIHRoaXMu X2ZpbmRCYW5uZXIuZW5hYmxlS2V5Ym9hcmRTaG9ydGN1dHMoKTsKKyAgICAgICAgaWYgKHRoaXMu X2ZpbmRCYW5uZXIpCisgICAgICAgICAgICB0aGlzLl9maW5kQmFubmVyLmVuYWJsZUtleWJvYXJk U2hvcnRjdXRzKCk7CiAgICAgfQogCiAgICAgaGlkZGVuKCkKICAgICB7CiAgICAgICAgIHRoaXMu X2NvbnRlbnRWaWV3Q29udGFpbmVyLmhpZGRlbigpOwogCi0gICAgICAgIHRoaXMuX2ZpbmRCYW5u ZXIuZGlzYWJsZUtleWJvYXJkU2hvcnRjdXRzKCk7CisgICAgICAgIGlmICh0aGlzLl9maW5kQmFu bmVyKQorICAgICAgICAgICAgdGhpcy5fZmluZEJhbm5lci5kaXNhYmxlS2V5Ym9hcmRTaG9ydGN1 dHMoKTsKICAgICB9CiAKICAgICAvLyBQcml2YXRlCkBAIC0zMDEsNiArMzA4LDkgQEAgV2ViSW5z cGVjdG9yLkNvbnRlbnRCcm93c2VyID0gY2xhc3MgQ29udGVudEJyb3dzZXIgZXh0ZW5kcyBXZWJJ bnNwZWN0b3IuVmlldwogCiAgICAgX2NvbnRlbnRWaWV3TnVtYmVyT2ZTZWFyY2hSZXN1bHRzRGlk Q2hhbmdlKGV2ZW50KQogICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLl9maW5kQmFubmVyKQorICAg ICAgICAgICAgcmV0dXJuOworCiAgICAgICAgIGlmIChldmVudC50YXJnZXQgIT09IHRoaXMuY3Vy cmVudENvbnRlbnRWaWV3KQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0zOTMsNiArNDAzLDkg QEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyID0gY2xhc3MgQ29udGVudEJyb3dzZXIgZXh0 ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogCiAgICAgX3VwZGF0ZUZpbmRCYW5uZXIoY3VycmVudENv bnRlbnRWaWV3KQogICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLl9maW5kQmFubmVyKQorICAgICAg ICAgICAgcmV0dXJuOworCiAgICAgICAgIGlmICghY3VycmVudENvbnRlbnRWaWV3KSB7CiAgICAg ICAgICAgICB0aGlzLl9maW5kQmFubmVyLnRhcmdldEVsZW1lbnQgPSBudWxsOwogICAgICAgICAg ICAgdGhpcy5fZmluZEJhbm5lci5udW1iZXJPZlJlc3VsdHMgPSBudWxsOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRp bmdDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMKaW5kZXggMDZmOWRlMi4uN2E4NmFj NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzCkBA IC00Miw3ICs0Miw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3 ID0gY2xhc3MgVGltZWxpbmVSZWNvcmRpbmdDb250ZW50VmlldyBlCiAgICAgICAgIHRoaXMuYWRk U3Vidmlldyh0aGlzLl90aW1lbGluZU92ZXJ2aWV3KTsKIAogICAgICAgICBjb25zdCBkaXNhYmxl QmFja0ZvcndhcmQgPSB0cnVlOwotICAgICAgICB0aGlzLl90aW1lbGluZUNvbnRlbnRCcm93c2Vy ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlcihudWxsLCB0aGlzLCBkaXNhYmxlQmFj a0ZvcndhcmQpOworICAgICAgICBjb25zdCBkaXNhYmxlRmluZEJhbm5lciA9IHRydWU7CisgICAg ICAgIHRoaXMuX3RpbWVsaW5lQ29udGVudEJyb3dzZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRl bnRCcm93c2VyKG51bGwsIHRoaXMsIGRpc2FibGVCYWNrRm9yd2FyZCwgZGlzYWJsZUZpbmRCYW5u ZXIpOwogICAgICAgICB0aGlzLl90aW1lbGluZUNvbnRlbnRCcm93c2VyLmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyLkV2ZW50LkN1cnJlbnRDb250ZW50Vmlld0Rp ZENoYW5nZSwgdGhpcy5fY3VycmVudENvbnRlbnRWaWV3RGlkQ2hhbmdlLCB0aGlzKTsKIAogICAg ICAgICB0aGlzLl9lbnRpcmVSZWNvcmRpbmdQYXRoQ29tcG9uZW50ID0gdGhpcy5fY3JlYXRlVGlt ZWxpbmVSYW5nZVBhdGhDb21wb25lbnQoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFbnRpcmUgUmVj b3JkaW5nIikpOwo=