Changeset 188679 in webkit

Timestamp:

Aug 19, 2015 9:09:14 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: DOMTree leaks on main resource changes
​https://bugs.webkit.org/show_bug.cgi?id=148158

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2015-08-19
Reviewed by Timothy Hatcher.

• UserInterface/Models/DOMTree.js:

(WebInspector.DOMTree.prototype.disconnect):
Add a way to disconnect the DOMTree and allow it to get garbage collected.

(WebInspector.DOMTree.prototype.invalidate.performInvalidate):
(WebInspector.DOMTree.prototype.invalidate):
(WebInspector.DOMTree.prototype._requestRootDOMNode):
(WebInspector.DOMTree.prototype._framePageExecutionContextChanged):
Remove some uses of the delete operator.

• UserInterface/Models/Frame.js:

(WebInspector.Frame.prototype.removeChildFrame):
(WebInspector.Frame.prototype.removeAllChildFrames):
(WebInspector.Frame.prototype._detachFromParentFrame):
When a frame gets removed from its parent, disconnect its DOMTree.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/DOMTree.js (modified) (5 diffs)
• UserInterface/Models/Frame.js (modified) (3 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-08-19  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: DOMTree leaks on main resource changes
+        https://bugs.webkit.org/show_bug.cgi?id=148158
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Models/DOMTree.js:
+        (WebInspector.DOMTree.prototype.disconnect):
+        Add a way to disconnect the DOMTree and allow it to get garbage collected.
+
+        (WebInspector.DOMTree.prototype.invalidate.performInvalidate):
+        (WebInspector.DOMTree.prototype.invalidate):
+        (WebInspector.DOMTree.prototype._requestRootDOMNode):
+        (WebInspector.DOMTree.prototype._framePageExecutionContextChanged):
+        Remove some uses of the delete operator.
+
+        * UserInterface/Models/Frame.js:
+        (WebInspector.Frame.prototype.removeChildFrame):
+        (WebInspector.Frame.prototype.removeAllChildFrames):
+        (WebInspector.Frame.prototype._detachFromParentFrame):
+        When a frame gets removed from its parent, disconnect its DOMTree.
+
 2015-08-19  Devin Rousso  <drousso@apple.com>
 

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

@@ -68 +68 @@
     }
 
+    disconnect()
+    {
+        WebInspector.domTreeManager.removeEventListener(null, null, this);
+        this._frame.removeEventListener(null, null, this);
+    }
+
     invalidate()
     {
@@ -75 +81 @@
         // Clear the pending callbacks. It is the responsibility of the client to listen for
         // the RootDOMNodeInvalidated event and request the root DOM node again.
-        delete this._pendingRootDOMNodeRequests;
+        this._pendingRootDOMNodeRequests = null;
 
         if (this._invalidateTimeoutIdentifier)
@@ -82 +88 @@
         function performInvalidate()
         {
-            delete this._invalidateTimeoutIdentifier;
+            this._invalidateTimeoutIdentifier = undefined;
 
             this.dispatchEventToListeners(WebInspector.DOMTree.Event.RootDOMNodeInvalidated);
@@ -198 +204 @@
             for (var i = 0; i < this._pendingRootDOMNodeRequests.length; ++i)
                 this._pendingRootDOMNodeRequests[i](this._rootDOMNode);
-            delete this._pendingRootDOMNodeRequests;
+            this._pendingRootDOMNodeRequests = null;
         }
 
@@ -243 +249 @@
             console.assert(this._pendingRootDOMNodeRequests && this._pendingRootDOMNodeRequests.length);
 
-            delete this._rootDOMNodeRequestWaitingForExecutionContext;
+            this._rootDOMNodeRequestWaitingForExecutionContext = false;
 
             this._requestRootDOMNode();

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

@@ -332 +332 @@
         delete this._childFrameIdentifierMap[childFrame._id];
 
-        childFrame._parentFrame = null;
+        childFrame._detachFromParentFrame();
 
         this.dispatchEventToListeners(WebInspector.Frame.Event.ChildFrameWasRemoved, {childFrame});
@@ -342 +342 @@
             return;
 
-        for (var i = 0; i < this._childFrames.length; ++i)
-            this._childFrames[i]._parentFrame = null;
+        for (let childFrame of this._childFrames)
+            childFrame._detachFromParentFrame();
 
         this._childFrames = [];
@@ -446 +446 @@
 
     // Private
+
+    _detachFromParentFrame()
+    {
+        if (this._domTree) {
+            this._domTree.disconnect();
+            this._domTree = null;
+        }
+
+        this._parentFrame = null;
+    }
 
     _isProvisionalResource(resource)