164804 2016-11-15 15:54:33 -0800 REGRESSION (r192344): Web Inspector: Turning off Code Coverage or Type Profiler logs an error 2016-12-02 12:59:27 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev nvasilyev bburg commit-queue joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1251687 0 nvasilyev 2016-11-15 15:54:33 -0800 [Error] Error in getting basic block locations: The VM does not currently have a Control Flow Profiler. (anonymous function) (BasicBlockAnnotator.js:61) (anonymous function) _dispatchResponseToCallback (Connection.js:146) _dispatchResponse (Connection.js:116) dispatch (Connection.js:69) dispatch (InspectorBackend.js:151) dispatchNextQueuedMessageFromBackend (MessageDispatcher.js:42) https://github.com/WebKit/webkit/blob/fa99d39839021e1855d14ac7d05d7771b1bb66a6/Source/WebInspectorUI/UserInterface/Controllers/BasicBlockAnnotator.js#L61 Besides the logged error, everything continues working as expected. 1251690 1 webkit-bug-importer 2016-11-15 15:57:23 -0800 <rdar://problem/29278028> 1251700 2 nvasilyev 2016-11-15 16:11:33 -0800 It looks like this.insertAnnotations gets called one last time after clicking on the [c] button. The timeout is usually successfully canceled by Annotator#clear. It could be a race condition somewhere. 1251756 3 nvasilyev 2016-11-15 18:59:48 -0800 Steps: 1. Open https://webkit.org/ 2. Open Resources tab. 3. Select global.js. 4. Click on the [c] icon to enable Code Coverage. 5. Reload the page. 6. Click on the [c] icon to disable Code Coverage. Notes: When reloading a page, Web Inspector may, for a fraction of a second, display some "ghost" JS resource that is different from the one that was selected before page reload. BasicBlockAnnotator gets created for that resource but, somehow, it doesn't get cleared properly. I'm investigating. 1251963 4 nvasilyev 2016-11-16 12:30:31 -0800 (In reply to comment #3) > Notes: > When reloading a page, Web Inspector may, for a fraction of a second, > display some "ghost" JS resource that is different from the one that was > selected before page reload. > > BasicBlockAnnotator gets created for that resource but, somehow, it doesn't > get cleared properly. I'm investigating. This hypothesis seems to be correct. I added console.trace("SourceCodeTextEditor %s", sourceCode._url) to SourceCodeTextEditor. I opened https://webkit.org/, selected global.js in the Resources, and reloaded the page. Here's the output: [Log] Trace: SourceCodeTextEditor https://webkit.org/ SourceCodeTextEditor (SourceCodeTextEditor.js:30) TextResourceContentView (TextResourceContentView.js:34) responseContentView (ResourceClusterContentView.js:69:82) _showContentViewForIdentifier (ResourceClusterContentView.js:217) restoreFromCookie (ResourceClusterContentView.js:139) _restoreFromCookie (BackForwardEntry.js:105) prepareToShow (BackForwardEntry.js:82) _showEntry (ContentViewContainer.js:497) showBackForwardEntryForIndex (ContentViewContainer.js:162) showContentView (ContentViewContainer.js:138) showDefaultContentViewForTreeElement (NavigationSidebarPanel.js:218:83) delayedWork (ResourceSidebarPanel.js:271) delayedWork [Log] Trace: SourceCodeTextEditor null SourceCodeTextEditor (SourceCodeTextEditor.js:30) ScriptContentView (ScriptContentView.js:48) createFromRepresentedObject (ContentView.js:55) contentViewForRepresentedObject (ContentView.js:173:83) showDefaultContentViewForTreeElement (NavigationSidebarPanel.js:213:83) _addScript (DebuggerSidebarPanel.js:546) _scriptAdded (DebuggerSidebarPanel.js:523) dispatch (Object.js:170) dispatchEventToListeners (Object.js:177) scriptDidParse (DebuggerManager.js:696) scriptParsed (DebuggerObserver.js:53) dispatchEvent (InspectorBackend.js:287) _dispatchEvent (Connection.js:193) dispatch (Connection.js:71) dispatch (InspectorBackend.js:151) dispatchNextQueuedMessageFromBackend (MessageDispatcher.js:42) [Log] Trace: SourceCodeTextEditor https://webkit.org/wp-content/themes/webkit/scripts/global.js?ver=1.0 SourceCodeTextEditor (SourceCodeTextEditor.js:30) TextResourceContentView (TextResourceContentView.js:34) responseContentView (ResourceClusterContentView.js:69:82) _showContentViewForIdentifier (ResourceClusterContentView.js:217) restoreFromCookie (ResourceClusterContentView.js:139) _restoreFromCookie (BackForwardEntry.js:105) prepareToShow (BackForwardEntry.js:82) _showEntry (ContentViewContainer.js:497) showBackForwardEntryForIndex (ContentViewContainer.js:162) showContentView (ContentViewContainer.js:138) showDefaultContentViewForTreeElement (NavigationSidebarPanel.js:218:83) _checkElementsForPendingViewStateCookie (NavigationSidebarPanel.js:776) _treeElementAddedOrChanged (NavigationSidebarPanel.js:633) dispatch (Object.js:170) dispatchEventToListeners (Object.js:177) insertChild (TreeOutline.js:227) _insertChildTreeElement (FolderizedTreeElement.js:253) _addTreeElement (FolderizedTreeElement.js:223) addChildForRepresentedObject (FolderizedTreeElement.js:110) onpopulate (FrameTreeElement.js:154) expand (TreeElement.js:373) shouldRefreshChildren (TreeElement.js:180) _populateFromNewChildQueue (FolderizedTreeElement.js:187) _populateFromNewChildQueue Besides the expected call for global.js, there're two other calls. showDefaultContentViewForTreeElement showed a resource different from the previously selected one. 1252038 5 nvasilyev 2016-11-16 15:04:59 -0800 Switching from one resource to another, generally, clears Annotator's timeouts: [Log] Trace: _clearTimeoutIfNeeded Script {_listeners: null, _originalRevision: SourceCodeRevision, _currentRevision: SourceCodeRevision, _sourceMaps: null, _formatterSourceMap: null, …} _clearTimeoutIfNeeded (Annotator.js:105) pause (Annotator.js:54) hidden (SourceCodeTextEditor.js:155) hidden (TextResourceContentView.js:114) prepareToHide (BackForwardEntry.js:95) _hideEntry (ContentViewContainer.js:509) hidden (ContentViewContainer.js:387) hidden (ClusterContentView.js:74) prepareToHide (BackForwardEntry.js:95) _hideEntry (ContentViewContainer.js:509) showBackForwardEntryForIndex (ContentViewContainer.js:161) showContentView (ContentViewContainer.js:138) showRepresentedObject (ContentBrowserTabContentView.js:185) showRepresentedObject (Main.js:1146) _treeSelectionDidChange (ResourceSidebarPanel.js:420) dispatch (Object.js:170) dispatchEventToListeners (Object.js:177) select (TreeElement.js:507) selectOnMouseDown (TreeElement.js:464) treeElementMouseDown (TreeElement.js:276) This, however, doesn't happen for a resource selected by showDefaultContentViewForTreeElement. It doesn't create a back forward entry and it doesn't call TextResourceContentView#hidden. 1252126 6 nvasilyev 2016-11-16 17:30:56 -0800 The problem is that we instantiate BasicBlockAnnotator for a script that is never shown. I'm experimenting with instantiating BasicBlockAnnotator in SourceCodeTextEditor#shown instead of SourceCodeTextEditor#_proceedPopulateWithContent. 1252169 7 joepeck 2016-11-16 18:51:40 -0800 (In reply to comment #6) > The problem is that we instantiate BasicBlockAnnotator for a script that is > never shown. > > I'm experimenting with instantiating BasicBlockAnnotator in > SourceCodeTextEditor#shown instead of > SourceCodeTextEditor#_proceedPopulateWithContent. Could you clarify what you mean here? A SourceCodeTextEditor is created, presumably it is shown. If its `shown` is not called, would calling it, and ensuring it gets the normal shown/hidden life cycle be a suitable fix? If `shown` is not getting called, it seems like just changing where the Annotator is created, might fix this but paste over other issues that would be solved by a proper `shown`/`hidden` life cycle. 1252181 8 nvasilyev 2016-11-16 19:36:08 -0800 (In reply to comment #6) > The problem is that we instantiate BasicBlockAnnotator for a script that is > never shown. > > I'm experimenting with instantiating BasicBlockAnnotator in > SourceCodeTextEditor#shown instead of > SourceCodeTextEditor#_proceedPopulateWithContent. This didn't fix anything. `shown` IS in fact getting called. The problem is that `hidden` isn't getting called. In ContentViewContainer#showBackForwardEntryForIndex there's this code: if (previousEntry) this._hideEntry(previousEntry); If we don't store a resource as a backForwardEntry, it doesn't get `hidden`. 1252900 9 nvasilyev 2016-11-18 15:29:30 -0800 (In reply to comment #8) > (In reply to comment #6) > > The problem is that we instantiate BasicBlockAnnotator for a script that is > > never shown. > > > > I'm experimenting with instantiating BasicBlockAnnotator in > > SourceCodeTextEditor#shown instead of > > SourceCodeTextEditor#_proceedPopulateWithContent. > > This didn't fix anything. `shown` IS in fact getting called. > > The problem is that `hidden` isn't getting called. > > In ContentViewContainer#showBackForwardEntryForIndex there's this code: > > if (previousEntry) > this._hideEntry(previousEntry); > > If we don't store a resource as a backForwardEntry, it doesn't get `hidden`. My assumption was wrong. We do store a resource as a backForwardEntry, but on a ContentViewContainer of an inactive tab. A ContentViewContainer that was never visible. In my case, Debugger tab's ContentViewContainer (I had Resources tab selected). Here's where this ContentViewContainer was instantiated: ContentViewContainer@ContentViewContainer.js:37:14 ContentBrowser@ContentBrowser.js:37:75 ContentBrowserTabContentView@ContentBrowserTabContentView.js:35:61 DebuggerTabContentView@DebuggerTabContentView.js:34:14 _createTabContentViewForType@Main.js:528:24 contentLoaded@Main.js:454:63 [native code] 1252922 10 nvasilyev 2016-11-18 16:02:05 -0800 This regressed 12 months ago in https://trac.webkit.org/changeset/192344. Bug 151149: Web Inspector: blank debugger tab when opening inspector on unvisited website 1252993 11 295237 nvasilyev 2016-11-18 17:47:36 -0800 Created attachment 295237 Patch In the future, we may want to make our view code less prone to errors related to visibility. 1255479 12 295237 mattbaker 2016-12-01 14:22:25 -0800 Comment on attachment 295237 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=295237&action=review > Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js:475 > + } It might be good to break this out into a helper function since it's used identically in two places. 1255584 13 mattbaker 2016-12-01 17:32:59 -0800 Should this check be performed in NavigationSidebarPanel.prototype.showDefaultContentViewForTreeElement? Potential side-effects should be considered, but it seems that not showing content views when the sidebar's content browser is hidden is the right thing to do. 1255787 14 295971 nvasilyev 2016-12-02 11:42:36 -0800 Created attachment 295971 Patch 1255833 15 295971 commit-queue 2016-12-02 12:59:23 -0800 Comment on attachment 295971 Patch Clearing flags on attachment: 295971 Committed r209257: <http://trac.webkit.org/changeset/209257> 1255834 16 commit-queue 2016-12-02 12:59:27 -0800 All reviewed patches have been landed. Closing bug. 295237 2016-11-18 17:47:36 -0800 2016-12-02 11:42:36 -0800 Patch patch.txt text/plain 2766 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDZjZDBjNmMuLjUzMzZmNzMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE2LTExLTE4ICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKHIxOTIzNDQp OiBXZWIgSW5zcGVjdG9yOiBUdXJuaW5nIG9mZiBDb2RlIENvdmVyYWdlIG9yIFR5cGUgUHJvZmls ZXIgbG9ncyBhbiBlcnJvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY0ODA0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yOTI3ODAyOD4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCYXNpY0Jsb2NrQW5u b3RhdG9yIGFuZCBUeXBlVG9rZW5Bbm5vdGF0b3Igd2VyZSBpbnN0YW5jaWF0ZWQgZm9yIGEgcmVz b3VyY2UgaW4gYW4gaW5hY3RpdmUgRGVidWdnZXIgdGFiLgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5EZWJ1Z2dlclNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2FkZFJlc291cmNlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2FkZFNjcmlwdCk6 CisKIDIwMTYtMTEtMTggIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgogCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IFRpbWVsaW5lRGF0YUdyaWROb2RlIGFzc2VydGlvbnMgd2hlbiBy ZWZyZXNoaW5nIHBhZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMKaW5kZXggNDc0 NzlhZC4uMzIzYjU1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMKQEAgLTQ2 Nyw4ICs0NjcsMTIgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVsID0gY2xhc3Mg RGVidWdnZXJTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbnNwZWMKICAgICAgICAgdGhpcy5fYWRk QnJlYWtwb2ludHNGb3JTb3VyY2VDb2RlKHJlc291cmNlKTsKICAgICAgICAgdGhpcy5fYWRkSXNz dWVzRm9yU291cmNlQ29kZShyZXNvdXJjZSk7CiAKLSAgICAgICAgaWYgKCF0aGlzLmNvbnRlbnRC cm93c2VyLmN1cnJlbnRDb250ZW50VmlldykKLSAgICAgICAgICAgIHRoaXMuc2hvd0RlZmF1bHRD b250ZW50Vmlld0ZvclRyZWVFbGVtZW50KHRyZWVFbGVtZW50KTsKKyAgICAgICAgaWYgKCF0aGlz LmNvbnRlbnRCcm93c2VyLmN1cnJlbnRDb250ZW50VmlldykgeworICAgICAgICAgICAgLy8gTWFr ZSBzdXJlIHdlIGFyZSBpbiB0aGUgRGVidWdnZXIgdGFiLgorICAgICAgICAgICAgbGV0IHNlbGVj dGVkVGFiQ29udGVudFZpZXcgPSBXZWJJbnNwZWN0b3IudGFiQnJvd3Nlci5zZWxlY3RlZFRhYkNv bnRlbnRWaWV3OworICAgICAgICAgICAgaWYgKHNlbGVjdGVkVGFiQ29udGVudFZpZXcgJiYgc2Vs ZWN0ZWRUYWJDb250ZW50Vmlldy5jb250ZW50QnJvd3NlciA9PT0gdGhpcy5jb250ZW50QnJvd3Nl cikKKyAgICAgICAgICAgICAgICB0aGlzLnNob3dEZWZhdWx0Q29udGVudFZpZXdGb3JUcmVlRWxl bWVudCh0cmVlRWxlbWVudCk7CisgICAgICAgIH0KICAgICB9CiAKICAgICBfbWFpblJlc291cmNl RGlkQ2hhbmdlKGV2ZW50KQpAQCAtNTQyLDggKzU0NiwxMiBAQCBXZWJJbnNwZWN0b3IuRGVidWdn ZXJTaWRlYmFyUGFuZWwgPSBjbGFzcyBEZWJ1Z2dlclNpZGViYXJQYW5lbCBleHRlbmRzIFdlYklu c3BlYwogICAgICAgICB0aGlzLl9hZGRCcmVha3BvaW50c0ZvclNvdXJjZUNvZGUoc2NyaXB0KTsK ICAgICAgICAgdGhpcy5fYWRkSXNzdWVzRm9yU291cmNlQ29kZShzY3JpcHQpOwogCi0gICAgICAg IGlmICghdGhpcy5jb250ZW50QnJvd3Nlci5jdXJyZW50Q29udGVudFZpZXcpCi0gICAgICAgICAg ICB0aGlzLnNob3dEZWZhdWx0Q29udGVudFZpZXdGb3JUcmVlRWxlbWVudCh0cmVlRWxlbWVudCk7 CisgICAgICAgIGlmICghdGhpcy5jb250ZW50QnJvd3Nlci5jdXJyZW50Q29udGVudFZpZXcpIHsK KyAgICAgICAgICAgIC8vIE1ha2Ugc3VyZSB3ZSBhcmUgaW4gdGhlIERlYnVnZ2VyIHRhYi4KKyAg ICAgICAgICAgIGxldCBzZWxlY3RlZFRhYkNvbnRlbnRWaWV3ID0gV2ViSW5zcGVjdG9yLnRhYkJy b3dzZXIuc2VsZWN0ZWRUYWJDb250ZW50VmlldzsKKyAgICAgICAgICAgIGlmIChzZWxlY3RlZFRh YkNvbnRlbnRWaWV3ICYmIHNlbGVjdGVkVGFiQ29udGVudFZpZXcuY29udGVudEJyb3dzZXIgPT09 IHRoaXMuY29udGVudEJyb3dzZXIpCisgICAgICAgICAgICAgICAgdGhpcy5zaG93RGVmYXVsdENv bnRlbnRWaWV3Rm9yVHJlZUVsZW1lbnQodHJlZUVsZW1lbnQpOworICAgICAgICB9CiAKICAgICAg ICAgcmV0dXJuIHRyZWVFbGVtZW50OwogICAgIH0K 295971 2016-12-02 11:42:36 -0800 2016-12-02 12:59:23 -0800 Patch patch.txt text/plain 2115 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDZjZDBjNmMuLmNiZmJkY2IgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE2LTEyLTAyICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKHIxOTIzNDQp OiBXZWIgSW5zcGVjdG9yOiBUdXJuaW5nIG9mZiBDb2RlIENvdmVyYWdlIG9yIFR5cGUgUHJvZmls ZXIgbG9ncyBhbiBlcnJvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY0ODA0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yOTI3ODAyOD4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCYXNpY0Jsb2NrQW5u b3RhdG9yIGFuZCBUeXBlVG9rZW5Bbm5vdGF0b3Igd2VyZSBpbnN0YW5jaWF0ZWQgZm9yIGEgcmVz b3VyY2UgaW4gYW4gaW5hY3RpdmUgRGVidWdnZXIgdGFiLgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlLnNob3dEZWZhdWx0Q29udGVudFZp ZXdGb3JUcmVlRWxlbWVudCk6CisgICAgICAgIERvbid0IHNob3cgYW55IGNvbnRlbnQgdmlldyBp ZiB3ZSBhcmUgbm90IGluIGEgc2VsZWN0ZWQgdGFiLgorCiAyMDE2LTExLTE4ICBNYXR0IEJha2Vy ICA8bWF0dGJha2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBUaW1lbGlu ZURhdGFHcmlkTm9kZSBhc3NlcnRpb25zIHdoZW4gcmVmcmVzaGluZyBwYWdlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lk ZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcwppbmRleCA5MTRlNzMxLi42NGY3YTg0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9u U2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKQEAgLTIxMyw2ICsyMTMsMTEgQEAgV2Vi SW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBOYXZpZ2F0aW9uU2lkZWJh clBhbmVsIGV4dGVuZHMgV2ViSW4KICAgICAgICAgICAgIGxldCBjb250ZW50VmlldyA9IHRoaXMu Y29udGVudEJyb3dzZXIuY29udGVudFZpZXdGb3JSZXByZXNlbnRlZE9iamVjdCh0cmVlRWxlbWVu dC5yZXByZXNlbnRlZE9iamVjdCk7CiAgICAgICAgICAgICBpZiAoY29udGVudFZpZXcgJiYgY29u dGVudFZpZXcucGFyZW50Q29udGFpbmVyICYmIGNvbnRlbnRWaWV3LnBhcmVudENvbnRhaW5lciAh PT0gdGhpcy5jb250ZW50QnJvd3Nlci5jb250ZW50Vmlld0NvbnRhaW5lcikKICAgICAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgICAgIC8vIGNvbnRlbnRWaWV3LnBhcmVudENv bnRhaW5lciBtYXkgYmUgbnVsbC4gQ2hlY2sgZm9yIHNlbGVjdGVkIHRhYiwgdG9vLgorICAgICAg ICAgICAgbGV0IHNlbGVjdGVkVGFiQ29udGVudFZpZXcgPSBXZWJJbnNwZWN0b3IudGFiQnJvd3Nl ci5zZWxlY3RlZFRhYkNvbnRlbnRWaWV3OworICAgICAgICAgICAgaWYgKHNlbGVjdGVkVGFiQ29u dGVudFZpZXcgJiYgc2VsZWN0ZWRUYWJDb250ZW50Vmlldy5jb250ZW50QnJvd3NlciAhPT0gdGhp cy5jb250ZW50QnJvd3NlcikKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAg IH0KIAogICAgICAgICBsZXQgY29udGVudFZpZXcgPSB0aGlzLmNvbnRlbnRCcm93c2VyLnNob3dD b250ZW50Vmlld0ZvclJlcHJlc2VudGVkT2JqZWN0KHRyZWVFbGVtZW50LnJlcHJlc2VudGVkT2Jq ZWN0KTsK