Changeset 136534 in webkit

Timestamp:

Dec 4, 2012 11:04:38 AM (11 years ago)

Author:

yurys@chromium.org

Message:

Web Inspector: Can't take a heap snapshot in chromium ("Uncaught ReferenceError")
​https://bugs.webkit.org/show_bug.cgi?id=103997

Reviewed by Pavel Feldman.

utilities.js used in both page and worker contexts should not access window
object as there is no one in case of workers. NonLeakingMutationObserver implementation
has moved to DOMExtension.js

• inspector/front-end/DOMExtension.js:

(NonLeakingMutationObserver.NonLeakingMutationObserver._unloadListener):
(NonLeakingMutationObserver):
(NonLeakingMutationObserver.prototype.observe):
(NonLeakingMutationObserver.prototype.disconnect):

• inspector/front-end/utilities.js:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/DOMExtension.js (modified) (1 diff)
• inspector/front-end/utilities.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-04  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: Can't take a heap snapshot in chromium ("Uncaught ReferenceError")
+        https://bugs.webkit.org/show_bug.cgi?id=103997
+
+        Reviewed by Pavel Feldman.
+
+        utilities.js used in both page and worker contexts should not access window
+        object as there is no one in case of workers. NonLeakingMutationObserver implementation
+        has moved to DOMExtension.js
+
+        * inspector/front-end/DOMExtension.js:
+        (NonLeakingMutationObserver.NonLeakingMutationObserver._unloadListener):
+        (NonLeakingMutationObserver):
+        (NonLeakingMutationObserver.prototype.observe):
+        (NonLeakingMutationObserver.prototype.disconnect):
+        * inspector/front-end/utilities.js:
+
 2012-12-04  Sheriff Bot  <webkit.review.bot@gmail.com>
 

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

@@ -548 +548 @@
     e.consume();
 }
+
+window.isUnderTest = false;
+
+/**
+ * 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);
+    if (!window.testRunner && !window.isUnderTest && !NonLeakingMutationObserver._unloadListener) {
+        NonLeakingMutationObserver._unloadListener = function() {
+            while (NonLeakingMutationObserver._instances.length)
+                NonLeakingMutationObserver._instances[NonLeakingMutationObserver._instances.length - 1].disconnect();
+        };
+        window.addEventListener("unload", NonLeakingMutationObserver._unloadListener, false);
+    }
+}
+
+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;
+    }
+}
+

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

@@ -861 +861 @@
     window.eval(xhr.responseText + "\n//@ sourceURL=" + scriptName);
 }
-
-window.isUnderTest = false;
-
-/**
- * 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);
-    if (!window.testRunner && !window.isUnderTest && !NonLeakingMutationObserver._unloadListener) {
-        NonLeakingMutationObserver._unloadListener = function() {
-            while (NonLeakingMutationObserver._instances.length)
-                NonLeakingMutationObserver._instances[NonLeakingMutationObserver._instances.length - 1].disconnect();
-        };
-        window.addEventListener("unload", NonLeakingMutationObserver._unloadListener, false);
-    }
-}
-
-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;
-    }
-}
-