Changeset 172038 in webkit

Timestamp:

Aug 5, 2014 11:29:42 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: shown() called on a content view when stepping over an instruction in the debugger
​https://bugs.webkit.org/show_bug.cgi?id=135311

Patch by Saam Barati <​sbarati@apple.com> on 2014-08-05
Reviewed by Timothy Hatcher.

ContentViewContainer should not repeatedly call ContentView.prototype.shown
on ContentViews that are already visible. ContentViewContainer now passes
a flag to BackForwardEntry.prototype.prepareToShow indicating whether it should
call the shown function on the ContentView it is about to display.
ContentViewContainer.prototype.showBackForwardEntryForIndex passes in this
flag based on its ContentView being visible.

• UserInterface/Models/BackForwardEntry.js:

(WebInspector.BackForwardEntry.prototype.prepareToShow):

• UserInterface/Views/ContentViewContainer.js:

(WebInspector.ContentViewContainer.prototype.showBackForwardEntryForIndex):
(WebInspector.ContentViewContainer.prototype.replaceContentView):
(WebInspector.ContentViewContainer.prototype.closeAllContentViewsOfPrototype):
(WebInspector.ContentViewContainer.prototype.shown):
(WebInspector.ContentViewContainer.prototype._showEntry):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/BackForwardEntry.js (modified) (1 diff)
• UserInterface/Views/ContentViewContainer.js (modified) (5 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2014-08-05  Saam Barati  <sbarati@apple.com>
+
+        Web Inspector: shown() called on a content view when stepping over an instruction in the debugger
+        https://bugs.webkit.org/show_bug.cgi?id=135311
+
+        Reviewed by Timothy Hatcher.
+
+        ContentViewContainer should not repeatedly call ContentView.prototype.shown 
+        on ContentViews that are already visible. ContentViewContainer now passes
+        a flag to BackForwardEntry.prototype.prepareToShow indicating whether it should
+        call the shown function on the ContentView it is about to display.
+        ContentViewContainer.prototype.showBackForwardEntryForIndex passes in this
+        flag based on its ContentView being visible.
+
+        * UserInterface/Models/BackForwardEntry.js:
+        (WebInspector.BackForwardEntry.prototype.prepareToShow):
+        * UserInterface/Views/ContentViewContainer.js:
+        (WebInspector.ContentViewContainer.prototype.showBackForwardEntryForIndex):
+        (WebInspector.ContentViewContainer.prototype.replaceContentView):
+        (WebInspector.ContentViewContainer.prototype.closeAllContentViewsOfPrototype):
+        (WebInspector.ContentViewContainer.prototype.shown):
+        (WebInspector.ContentViewContainer.prototype._showEntry):
+
 2014-08-01  Jonathan Wells  <jonowells@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Models/BackForwardEntry.js

@@ -53 +53 @@
     },
 
-    prepareToShow: function()
+    prepareToShow: function(shouldCallShown)
     {
         this._restoreFromCookie();
 
         this.contentView.visible = true;
-        this.contentView.shown();
+        if (shouldCallShown)
+            this.contentView.shown();
         this.contentView.updateLayout();
     },

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

@@ -191 +191 @@
             return;
 
-        // Hide the currently visible content view.
         var previousEntry = this.currentBackForwardEntry;
-        if (previousEntry)
-            this._hideEntry(previousEntry);
-
         this._currentIndex = index;
         var currentEntry = this.currentBackForwardEntry;
         console.assert(currentEntry);
 
-        this._showEntry(currentEntry);
+        var isNewContentView = !previousEntry || !currentEntry.contentView.visible;
+        if (isNewContentView) {
+            // Hide the currently visible content view.
+            if (previousEntry)
+                this._hideEntry(previousEntry);
+            this._showEntry(currentEntry, true);
+        } else
+            this._showEntry(currentEntry, false);
 
         this.dispatchEventToListeners(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange);
@@ -241 +244 @@
         // Re-show the current entry, because its content view instance was replaced.
         if (currentlyShowing) {
-            this._showEntry(this.currentBackForwardEntry);
+            this._showEntry(this.currentBackForwardEntry, true);
             this.dispatchEventToListeners(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange);
         }
@@ -297 +300 @@
 
         if (currentEntry && currentEntry.contentView !== oldCurrentContentView || backForwardListDidChange) {
-            this._showEntry(currentEntry);
+            this._showEntry(currentEntry, true);
             this.dispatchEventToListeners(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange);
         }
@@ -353 +356 @@
             return;
 
-        this._showEntry(currentEntry);
+        this._showEntry(currentEntry, true);
     },
 
@@ -394 +397 @@
     },
 
-    _showEntry: function(entry)
+    _showEntry: function(entry, shouldCallShown)
     {
         console.assert(entry instanceof WebInspector.BackForwardEntry);
 
         this._addContentViewElement(entry.contentView);
-        entry.prepareToShow();
+        entry.prepareToShow(shouldCallShown);
     },