Changeset 134627 in webkit

Timestamp:

Nov 14, 2012, 10:48:59 AM (12 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: keep track of mutation observers and disconnect them upon upload
​https://bugs.webkit.org/show_bug.cgi?id=102239

Reviewed by Vsevolod Vlasov.

Otherwise we hit memory leaks.

• inspector/front-end/DefaultTextEditor.js:

(WebInspector.DefaultTextEditor.prototype.wasShown):
(WebInspector.DefaultTextEditor.prototype.willHide):
(WebInspector.TextEditorMainPanel.prototype._wasShown):
(WebInspector.TextEditorMainPanel.prototype._willHide):
(WebInspector.TextEditorMainPanel.prototype._attachMutationObserver):
(WebInspector.TextEditorMainPanel.prototype._detachMutationObserver):

• inspector/front-end/utilities.js:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/DefaultTextEditor.js (modified) (4 diffs)
• inspector/front-end/utilities.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-14  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: keep track of mutation observers and disconnect them upon upload
+        https://bugs.webkit.org/show_bug.cgi?id=102239
+
+        Reviewed by Vsevolod Vlasov.
+
+        Otherwise we hit memory leaks.
+
+        * inspector/front-end/DefaultTextEditor.js:
+        (WebInspector.DefaultTextEditor.prototype.wasShown):
+        (WebInspector.DefaultTextEditor.prototype.willHide):
+        (WebInspector.TextEditorMainPanel.prototype._wasShown):
+        (WebInspector.TextEditorMainPanel.prototype._willHide):
+        (WebInspector.TextEditorMainPanel.prototype._attachMutationObserver):
+        (WebInspector.TextEditorMainPanel.prototype._detachMutationObserver):
+        * inspector/front-end/utilities.js:
+
 2012-11-14  Sergio Villar Senin  <svillar@igalia.com>
 

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

@@ -561 +561 @@
         this._boundSelectionChangeListener = this._mainPanel._handleSelectionChange.bind(this._mainPanel);
         document.addEventListener("selectionchange", this._boundSelectionChangeListener, false);
-        this._mainPanel._attachMutationObserver();
+        this._mainPanel._wasShown();
     },
 
@@ -572 +572 @@
     willHide: function()
     {
-        this._mainPanel._detachMutationObserver();
+        this._mainPanel._willHide();
         document.removeEventListener("selectionchange", this._boundSelectionChangeListener, false);
         delete this._boundSelectionChangeListener;
@@ -1240 +1240 @@
 
 WebInspector.TextEditorMainPanel.prototype = {
+    _wasShown: function()
+    {
+        this._isShowing = true;
+        this._attachMutationObserver();
+    },
+
+    _willHide: function()
+    {
+        this._detachMutationObserver();
+        this._isShowing = false;
+    },
+
     _attachMutationObserver: function()
     {
+        if (!this._isShowing)
+            return;
+
         if (this._mutationObserver)
             this._mutationObserver.disconnect();
-        this._mutationObserver = new WebKitMutationObserver(this._handleMutations.bind(this));
+        this._mutationObserver = new NonLeakingMutationObserver(this._handleMutations.bind(this));
         this._mutationObserver.observe(this._container, { subtree: true, childList: true, characterData: true });
     },
@@ -1250 +1265 @@
     _detachMutationObserver: function()
     {
+        if (!this._isShowing)
+            return;
+
         if (this._mutationObserver) {
             this._mutationObserver.disconnect();

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

@@ -867 +867 @@
     window.eval(xhr.responseText + "\n//@ sourceURL=" + scriptName);
 }
+
+
+/**
+ * Mutation observers leak memory. Keep track of them and disconnect
+ * on unload.
+ * @constructor
+ * @param {function(Array.<WebKitMutation>)} handler
+ */
+function NonLeakingMutationObserver(handler)
+{
+    this._observer = new WebKitMutationObserver(handler);
+    NonLeakingMutationObserver._instances.push(this);
+}
+
+NonLeakingMutationObserver._instances = [];
+
+NonLeakingMutationObserver.prototype = {
+    /**
+     * @param {Element} element
+     * @param {Object} config
+     */
+    observe: function(element, config)
+    {
+        if (this._observer)
+            this._observer.observe(element, config);
+    },
+
+    disconnect: function()
+    {
+        if (this._observer)
+            this._observer.disconnect();
+        NonLeakingMutationObserver._instances.remove(this);
+        delete this._observer;
+    }
+}
+
+if (!window.testRunner) {
+    window.addEventListener("unload", function() {
+        while (NonLeakingMutationObserver._instances.length)
+            NonLeakingMutationObserver._instances[NonLeakingMutationObserver._instances.length - 1].disconnect();
+    }, false);
+}
+