Title: [230149] trunk/Source/WebInspectorUI
Revision
230149
Author
[email protected]
Date
2018-04-01 22:59:28 -0700 (Sun, 01 Apr 2018)

Log Message

Web Inspector: Remove dead TabBrowser/TabContentView code
https://bugs.webkit.org/show_bug.cgi?id=184104

Reviewed by Devin Rousso.

* UserInterface/Base/Main.js:
(WI._tryToRestorePendingTabs):
* UserInterface/Views/NewTabContentView.js:
(WI.NewTabContentView.prototype.shown):
(WI.NewTabContentView.prototype.hidden):
* UserInterface/Views/TabBrowser.js:
(WI.TabBrowser.prototype.addTabForContentView):
(WI.TabBrowser.prototype.showTabForContentView):
(WI.TabBrowser._tabBarItemRemoved):
* UserInterface/Views/TabContentView.js:
(WI.TabContentView.prototype.get parentTabBrowser): Deleted.
(WI.TabContentView.prototype.set parentTabBrowser): Deleted.

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (230148 => 230149)


--- trunk/Source/WebInspectorUI/ChangeLog	2018-04-02 05:03:57 UTC (rev 230148)
+++ trunk/Source/WebInspectorUI/ChangeLog	2018-04-02 05:59:28 UTC (rev 230149)
@@ -1,3 +1,23 @@
+2018-04-01  Matt Baker  <[email protected]>
+
+        Web Inspector: Remove dead TabBrowser/TabContentView code
+        https://bugs.webkit.org/show_bug.cgi?id=184104
+
+        Reviewed by Devin Rousso.
+
+        * UserInterface/Base/Main.js:
+        (WI._tryToRestorePendingTabs):
+        * UserInterface/Views/NewTabContentView.js:
+        (WI.NewTabContentView.prototype.shown):
+        (WI.NewTabContentView.prototype.hidden):
+        * UserInterface/Views/TabBrowser.js:
+        (WI.TabBrowser.prototype.addTabForContentView):
+        (WI.TabBrowser.prototype.showTabForContentView):
+        (WI.TabBrowser._tabBarItemRemoved):
+        * UserInterface/Views/TabContentView.js:
+        (WI.TabContentView.prototype.get parentTabBrowser): Deleted.
+        (WI.TabContentView.prototype.set parentTabBrowser): Deleted.
+
 2018-03-30  Devin Rousso  <[email protected]>
 
         Web Inspector: tint all pixels drawn by shader program when hovering ShaderProgramTreeElement

Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (230148 => 230149)


--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js	2018-04-02 05:03:57 UTC (rev 230148)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js	2018-04-02 05:59:28 UTC (rev 230149)
@@ -614,7 +614,7 @@
     this._pendingOpenTabs = stillPendingOpenTabs;
 
     if (!WI.settings.experimentalEnableNewTabBar.value)
-        this.tabBrowser.tabBar.updateNewTabTabBarItemState();
+        this.tabBar.updateNewTabTabBarItemState();
 };
 
 WI.showNewTabTab = function(options)
@@ -1416,8 +1416,6 @@
     if (!event.target.isMainFrame())
         return;
 
-    this._inProvisionalLoad = false;
-
     // Run cookie restoration after we are sure all of the Tabs and NavigationSidebarPanels
     // have updated with respect to the main resource change.
     setTimeout(this._restoreCookieForOpenTabs.bind(this, WI.StateRestorationType.Navigation));
@@ -1433,8 +1431,6 @@
         return;
 
     this._saveCookieForOpenTabs();
-
-    this._inProvisionalLoad = true;
 };
 
 WI._restoreCookieForOpenTabs = function(restorationType)

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NewTabContentView.js (230148 => 230149)


--- trunk/Source/WebInspectorUI/UserInterface/Views/NewTabContentView.js	2018-04-02 05:03:57 UTC (rev 230148)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NewTabContentView.js	2018-04-02 05:59:28 UTC (rev 230149)
@@ -62,8 +62,8 @@
 
     shown()
     {
-        WI.tabBrowser.tabBar.addEventListener(WI.TabBar.Event.TabBarItemAdded, this._updateTabItems, this);
-        WI.tabBrowser.tabBar.addEventListener(WI.TabBar.Event.TabBarItemRemoved, this._updateTabItems, this);
+        WI.tabBar.addEventListener(WI.TabBar.Event.TabBarItemAdded, this._updateTabItems, this);
+        WI.tabBar.addEventListener(WI.TabBar.Event.TabBarItemRemoved, this._updateTabItems, this);
 
         this._updateTabItems();
     }
@@ -70,7 +70,7 @@
 
     hidden()
     {
-        WI.tabBrowser.tabBar.removeEventListener(null, null, this);
+        WI.tabBar.removeEventListener(null, null, this);
     }
 
     get supportsSplitContentBrowser()

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js (230148 => 230149)


--- trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js	2018-04-02 05:03:57 UTC (rev 230148)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js	2018-04-02 05:59:28 UTC (rev 230149)
@@ -157,8 +157,6 @@
         if (tabBarItem.representedObject !== tabContentView)
             tabBarItem.representedObject = tabContentView;
 
-        tabContentView.parentTabBrowser = this;
-
         if (tabBarItem.parentTabBar === this._tabBar)
             return true;
 
@@ -185,8 +183,7 @@
         if (!this.addTabForContentView(tabContentView, options))
             return false;
 
-        if (!options.suppressSelection)
-            this._tabBar.selectedTabBarItem = tabContentView.tabBarItem;
+        this._tabBar.selectedTabBarItem = tabContentView.tabBarItem;
 
         // FIXME: this is a workaround for <https://webkit.org/b/151876>.
         // Without this extra call, we might never lay out the child tab
@@ -292,8 +289,6 @@
 
         this._contentViewContainer.closeContentView(tabContentView);
 
-        tabContentView.parentTabBrowser = null;
-
         console.assert(this._recentTabContentViews.length === this._tabBar.saveableTabCount);
         console.assert(!this.selectedTabContentView || this.selectedTabContentView === this._recentTabContentViews[0]);
     }

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js (230148 => 230149)


--- trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js	2018-04-02 05:03:57 UTC (rev 230148)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js	2018-04-02 05:59:28 UTC (rev 230149)
@@ -79,16 +79,6 @@
         return null;
     }
 
-    get parentTabBrowser()
-    {
-        return this._parentTabBrowser;
-    }
-
-    set parentTabBrowser(tabBrowser)
-    {
-        this._parentTabBrowser = tabBrowser || null;
-    }
-
     get identifier()
     {
         return this._identifier;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to