Changeset 145533 in webkit

Timestamp:

Mar 12, 2013 5:29:03 AM (11 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: SourceFrames are leaking on reload.
​https://bugs.webkit.org/show_bug.cgi?id=111961

Reviewed by Alexander Pavlov.

Source/WebCore:

Added dispose method on UISourceCodeFrame.
Scripts panel now calls dispose when SourceFrame is removed and JavaScriptSourceFrame
could remove breakpoint manager listeners in it.
TabbedEditorContainer does not call viewForFile other than in appendFileTab methods to
avoid recreating SourceFrame for uiSourceCode when it was already removed.

Test: inspector/debugger/breakpoint-manager-listeners-count.html

• inspector/front-end/JavaScriptSourceFrame.js:

(WebInspector.JavaScriptSourceFrame.prototype.dispose):

• inspector/front-end/ScriptsPanel.js:
• inspector/front-end/TabbedEditorContainer.js:

(WebInspector.TabbedEditorContainer.prototype._addScrollAndSelectionListeners):
(WebInspector.TabbedEditorContainer.prototype._removeScrollAndSelectionListeners):
(WebInspector.TabbedEditorContainer.prototype._tabClosed):

• inspector/front-end/UISourceCodeFrame.js:

(WebInspector.UISourceCodeFrame.prototype.dispose):

LayoutTests:

• inspector/debugger/breakpoint-manager-listeners-count-expected.txt: Added.
• inspector/debugger/breakpoint-manager-listeners-count.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/breakpoint-manager-listeners-count-expected.txt (added)
• LayoutTests/inspector/debugger/breakpoint-manager-listeners-count.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/JavaScriptSourceFrame.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/ScriptsPanel.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/TabbedEditorContainer.js (modified) (3 diffs)
• Source/WebCore/inspector/front-end/UISourceCodeFrame.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-12  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: SourceFrames are leaking on reload.
+        https://bugs.webkit.org/show_bug.cgi?id=111961
+
+        Reviewed by Alexander Pavlov.
+
+        * inspector/debugger/breakpoint-manager-listeners-count-expected.txt: Added.
+        * inspector/debugger/breakpoint-manager-listeners-count.html: Added.
+
 2013-03-12  Krzysztof Czech  <k.czech@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-12  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: SourceFrames are leaking on reload.
+        https://bugs.webkit.org/show_bug.cgi?id=111961
+
+        Reviewed by Alexander Pavlov.
+
+        Added dispose method on UISourceCodeFrame.
+        Scripts panel now calls dispose when SourceFrame is removed and JavaScriptSourceFrame
+        could remove breakpoint manager listeners in it.
+        TabbedEditorContainer does not call viewForFile other than in appendFileTab methods to 
+        avoid recreating SourceFrame for uiSourceCode when it was already removed.
+
+        Test: inspector/debugger/breakpoint-manager-listeners-count.html
+
+        * inspector/front-end/JavaScriptSourceFrame.js:
+        (WebInspector.JavaScriptSourceFrame.prototype.dispose):
+        * inspector/front-end/ScriptsPanel.js:
+        * inspector/front-end/TabbedEditorContainer.js:
+        (WebInspector.TabbedEditorContainer.prototype._addScrollAndSelectionListeners):
+        (WebInspector.TabbedEditorContainer.prototype._removeScrollAndSelectionListeners):
+        (WebInspector.TabbedEditorContainer.prototype._tabClosed):
+        * inspector/front-end/UISourceCodeFrame.js:
+        (WebInspector.UISourceCodeFrame.prototype.dispose):
+
 2013-03-12  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/JavaScriptSourceFrame.js

@@ -587 +587 @@
     },
 
+    dispose: function()
+    {
+        this._breakpointManager.removeEventListener(WebInspector.BreakpointManager.Events.BreakpointAdded, this._breakpointAdded, this);
+        this._breakpointManager.removeEventListener(WebInspector.BreakpointManager.Events.BreakpointRemoved, this._breakpointRemoved, this);
+        WebInspector.UISourceCodeFrame.prototype.dispose.call(this);
+    },
+
     __proto__: WebInspector.UISourceCodeFrame.prototype
 }

trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js

@@ -494 +494 @@
             return;
         this._sourceFramesByUISourceCode.remove(uiSourceCode);
-        sourceFrame.detach();
+        sourceFrame.dispose();
     },
 

trunk/Source/WebCore/inspector/front-end/TabbedEditorContainer.js

@@ -111 +111 @@
     _addScrollAndSelectionListeners: function()
     {
-        console.assert(this._currentFile);
-        var sourceFrame = this._delegate.viewForFile(this._currentFile);
-        sourceFrame.addEventListener(WebInspector.SourceFrame.Events.ScrollChanged, this._scrollChanged, this);
-        sourceFrame.addEventListener(WebInspector.SourceFrame.Events.SelectionChanged, this._selectionChanged, this);
+        if (!this._currentView)
+            return;
+        this._currentView.addEventListener(WebInspector.SourceFrame.Events.ScrollChanged, this._scrollChanged, this);
+        this._currentView.addEventListener(WebInspector.SourceFrame.Events.SelectionChanged, this._selectionChanged, this);
     },
 
     _removeScrollAndSelectionListeners: function()
     {
-        if (!this._currentFile)
-            return;
-        var sourceFrame = this._delegate.viewForFile(this._currentFile);
-        sourceFrame.removeEventListener(WebInspector.SourceFrame.Events.ScrollChanged, this._scrollChanged, this);
-        sourceFrame.removeEventListener(WebInspector.SourceFrame.Events.SelectionChanged, this._selectionChanged, this);
+        if (!this._currentView)
+            return;
+        this._currentView.removeEventListener(WebInspector.SourceFrame.Events.ScrollChanged, this._scrollChanged, this);
+        this._currentView.removeEventListener(WebInspector.SourceFrame.Events.SelectionChanged, this._selectionChanged, this);
     },
 
@@ -157 +156 @@
             this._editorSelectedByUserAction();
         
+        this._currentView = this.visibleView;
         this._addScrollAndSelectionListeners();
         
@@ -309 +309 @@
         if (this._currentFile === uiSourceCode) {
             this._removeScrollAndSelectionListeners();
+            delete this._currentView;
             delete this._currentFile;
         }

trunk/Source/WebCore/inspector/front-end/UISourceCodeFrame.js

@@ -157 +157 @@
     },
 
+    dispose: function()
+    {
+        this.detach();
+    },
+
     __proto__: WebInspector.SourceFrame.prototype
 }