Changeset 225280 in webkit

Timestamp:

Nov 29, 2017 11:07:11 AM (6 years ago)

Author:

Joseph Pecoraro

Message:

Web Inspector: Console Tab navigation bar sometimes does not include filter bar, clear console sometimes does not work
​https://bugs.webkit.org/show_bug.cgi?id=180124
<rdar://problem/35740353>

Reviewed by Brian Burg.

• UserInterface/Views/LogContentView.js:

(WI.LogContentView.prototype.closed):
Avoid removing event listeners if this LogContentView singleton is ever closed.
The singleton will always be alive so we don't want to remove the event listeners
without a way to add them back.

• UserInterface/Base/Main.js:

(WI.showSplitConsole):

• UserInterface/Views/ConsoleTabContentView.js:

(WI.ConsoleTabContentView.prototype.shown):
When showing the ConsoleTab immediately collapse the split console so that any
following code that checks WI.isShowingSplitConsole will get the expected value.
It is also now possible to share a ContentView across ContentBrowsers via
tombstones, so remove the old code that would frequently close the LogContentView.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (1 diff)
• UserInterface/Views/ConsoleTabContentView.js (modified) (1 diff)
• UserInterface/Views/LogContentView.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-11-29  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Console Tab navigation bar sometimes does not include filter bar, clear console sometimes does not work
+        https://bugs.webkit.org/show_bug.cgi?id=180124
+        <rdar://problem/35740353>
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Views/LogContentView.js:
+        (WI.LogContentView.prototype.closed):
+        Avoid removing event listeners if this LogContentView singleton is ever closed.
+        The singleton will always be alive so we don't want to remove the event listeners
+        without a way to add them back.
+
+        * UserInterface/Base/Main.js:
+        (WI.showSplitConsole):
+        * UserInterface/Views/ConsoleTabContentView.js:
+        (WI.ConsoleTabContentView.prototype.shown):
+        When showing the ConsoleTab immediately collapse the split console so that any
+        following code that checks WI.isShowingSplitConsole will get the expected value.
+        It is also now possible to share a ContentView across ContentBrowsers via
+        tombstones, so remove the old code that would frequently close the LogContentView.
+
 2017-11-28  Devin Rousso  <webkit@devinrousso.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -887 +887 @@
         return;
 
-    // Be sure to close the view in the tab content browser before showing it in the
-    // split content browser. We can only show a content view in one browser at a time.
-    if (this.consoleContentView.parentContainer)
-        this.consoleContentView.parentContainer.closeContentView(this.consoleContentView);
     this.consoleDrawer.showContentView(this.consoleContentView);
 };

trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleTabContentView.js

@@ -53 +53 @@
         super.shown();
 
-        WI.consoleContentView.prompt.focus();
-
-        if (this.contentBrowser.currentContentView === WI.consoleContentView)
-            return;
-
-        // Be sure to close the view in the split content browser before showing it in the
-        // tab content browser. We can only show a content view in one browser at a time.
-        if (WI.consoleContentView.parentContainer)
-            WI.consoleContentView.parentContainer.closeContentView(WI.consoleContentView);
+        WI.hideSplitConsole();
 
         this.contentBrowser.showContentView(WI.consoleContentView);
+        WI.consoleContentView.dispatchEventToListeners(WI.ContentView.Event.NavigationItemsDidChange);
+
+        WI.consoleContentView.prompt.focus();
 
         console.assert(this.contentBrowser.currentContentView === WI.consoleContentView);

trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js

@@ -171 +171 @@
     closed()
     {
-        WI.logManager.removeEventListener(null, null, this);
-        WI.Frame.removeEventListener(null, null, this);
+        // While it may be possible to get here, this is a singleton ContentView instance
+        // that is often re-inserted back into different ContentBrowsers, so we shouldn't
+        // remove the event listeners. The singleton will never go away anyways.
+        console.assert(this === WI.consoleContentView);
 
         super.closed();