Changeset 83707 in webkit

Timestamp:

Apr 13, 2011 12:22:34 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2011-04-13 Pavel Feldman <​pfeldman@google.com>

Reviewed by Yury Semikhatsky.

Web Inspector: requestDocument can result in race condition in DOMAgent.js
​https://bugs.webkit.org/show_bug.cgi?id=58415

• inspector/front-end/DOMAgent.js: (WebInspector.DOMAgent.prototype.requestDocument.onDocumentAvailable): (WebInspector.DOMAgent.prototype.requestDocument):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/DOMAgent.js (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-13  Pavel Feldman  <pfeldman@google.com>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: requestDocument can result in race condition in DOMAgent.js
+        https://bugs.webkit.org/show_bug.cgi?id=58415
+
+        * inspector/front-end/DOMAgent.js:
+        (WebInspector.DOMAgent.prototype.requestDocument.onDocumentAvailable):
+        (WebInspector.DOMAgent.prototype.requestDocument):
+
 2011-04-12  Pavel Feldman  <pfeldman@google.com>
 

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

@@ -351 +351 @@
         }
 
+        if (this._pendingDocumentRequestCallbacks) {
+            this._pendingDocumentRequestCallbacks.push(callback);
+            return;
+        }
+
+        this._pendingDocumentRequestCallbacks = [callback];
+
         function onDocumentAvailable(error, root)
         {
@@ -356 +363 @@
                 this._setDocument(root);
 
-            if (callback)
-                callback(this._document);
-        }
+            for (var i = 0; i < this._pendingDocumentRequestCallbacks.length; ++i) {
+                var callback = this._pendingDocumentRequestCallbacks[i];
+                if (callback)
+                    callback(this._document);
+            }
+            delete this._pendingDocumentRequestCallbacks;
+        }
+
         DOMAgent.getDocument(onDocumentAvailable.bind(this));
     },