Title: [183733] trunk/Source/WebInspectorUI
- Revision
- 183733
- Author
- [email protected]
- Date
- 2015-05-03 15:55:08 -0700 (Sun, 03 May 2015)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (183732 => 183733)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-05-03 16:10:43 UTC (rev 183732)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-05-03 22:55:08 UTC (rev 183733)
@@ -1,3 +1,16 @@
+2015-05-03 Timothy Hatcher <[email protected]>
+
+ 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 <[email protected]>
Web Inspector: Relocate the selected range details in the Rendering Frames timeline UI
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js (183732 => 183733)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js 2015-05-03 16:10:43 UTC (rev 183732)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js 2015-05-03 22:55:08 UTC (rev 183733)
@@ -174,11 +174,12 @@
// Disassociate with the removed content views.
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);
}
// Associate with the new content view.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
