Changeset 183733 in webkit

Timestamp:

May 3, 2015 3:55:08 PM (9 years ago)

Author:

timothy@apple.com

Message:

Web Inspector: Exception under ContentViewContainer _disassociateFromContentView
​https://bugs.webkit.org/show_bug.cgi?id=144546

Reviewed by Brian Burg.

• UserInterface/Views/ContentViewContainer.js:

(WebInspector.ContentViewContainer.prototype.showContentView):
Make sure to pass the ContentView to _disassociateFromContentView. Also negate the result
of the _backForwardList.some(), since we don't want to dissociate if the content view is
still in the back-forward list.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/ContentViewContainer.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-05-03  Timothy Hatcher  <timothy@apple.com>
+
+        Web Inspector: Exception under ContentViewContainer _disassociateFromContentView
+        https://bugs.webkit.org/show_bug.cgi?id=144546
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Views/ContentViewContainer.js:
+        (WebInspector.ContentViewContainer.prototype.showContentView):
+        Make sure to pass the ContentView to _disassociateFromContentView. Also negate the result
+        of the _backForwardList.some(), since we don't want to dissociate if the content view is
+        still in the back-forward list.
+
 2015-05-02  Matt Baker  <mattbaker@apple.com>
 

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

@@ -175 +175 @@
         for (var i = 0; i < removedEntries.length; ++i) {
             // Skip disassociation if this content view is still in the back/forward list.
-            var shouldDissociateContentView = this._backForwardList.some(function(existingEntry) {
+            var shouldDissociateContentView = !this._backForwardList.some(function(existingEntry) {
                 return existingEntry.contentView === removedEntries[i].contentView;
             });
+
             if (shouldDissociateContentView)
-                this._disassociateFromContentView(removedEntries[i]);
+                this._disassociateFromContentView(removedEntries[i].contentView);
         }