Title: [105274] trunk/Source/WebCore
- Revision
- 105274
- Author
- [email protected]
- Date
- 2012-01-18 07:21:48 -0800 (Wed, 18 Jan 2012)
Log Message
Web Inspector: resource tree model leaks frames
https://bugs.webkit.org/show_bug.cgi?id=76533
Reviewed by Pavel Feldman.
* inspector/front-end/ResourceTreeModel.js:
(WebInspector.ResourceTreeModel.prototype._frameDetached):
(WebInspector.ResourceTreeModel.prototype._removeFrame):
(WebInspector.ResourceTreeFrame.prototype._removeChildFrame):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (105273 => 105274)
--- trunk/Source/WebCore/ChangeLog 2012-01-18 15:07:13 UTC (rev 105273)
+++ trunk/Source/WebCore/ChangeLog 2012-01-18 15:21:48 UTC (rev 105274)
@@ -1,3 +1,15 @@
+2012-01-18 Andrey Kosyakov <[email protected]>
+
+ Web Inspector: resource tree model leaks frames
+ https://bugs.webkit.org/show_bug.cgi?id=76533
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/front-end/ResourceTreeModel.js:
+ (WebInspector.ResourceTreeModel.prototype._frameDetached):
+ (WebInspector.ResourceTreeModel.prototype._removeFrame):
+ (WebInspector.ResourceTreeFrame.prototype._removeChildFrame):
+
2012-01-17 Vsevolod Vlasov <[email protected]>
Web Inspector: Enable support for Open Script dialog based on FilteredItemSelectionDialog.
Modified: trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js (105273 => 105274)
--- trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js 2012-01-18 15:07:13 UTC (rev 105273)
+++ trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js 2012-01-18 15:21:48 UTC (rev 105274)
@@ -186,11 +186,8 @@
if (frame.parentFrame)
frame.parentFrame._removeChildFrame(frame);
- else {
- // Report that root is detached
- frame._removeChildFrames();
- this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.FrameDetached, frame);
- }
+ else
+ frame._remove();
},
/**
@@ -524,9 +521,8 @@
*/
_removeChildFrame: function(frame)
{
- frame._removeChildFrames();
this._childFrames.remove(frame);
- this._model.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.FrameDetached, frame);
+ frame._remove();
},
_removeChildFrames: function()
@@ -536,6 +532,13 @@
this._removeChildFrame(copy[i]);
},
+ _remove: function()
+ {
+ this._removeChildFrames();
+ delete this._model._frames[this.id];
+ this._model.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.FrameDetached, this);
+ },
+
/**
* @param {WebInspector.Resource} resource
*/
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
