Changeset 128892 in webkit

Timestamp:

Sep 18, 2012 7:14:10 AM (12 years ago)

Author:

caseq@chromium.org

Message:

Web Inspector: [Extensions API] postpone requests to add extensions until extension server is initialized
​https://bugs.webkit.org/show_bug.cgi?id=97012

Reviewed by Vsevolod Vlasov.

• queue extensions being added unless initialization is complete;
• add queued extensions upon completion of initialization;

• inspector/front-end/ExtensionServer.js:

(WebInspector.ExtensionServer.prototype.initExtensions):
(WebInspector.ExtensionServer.prototype._addExtensions):
(WebInspector.ExtensionServer.prototype._addExtension):
(WebInspector.ExtensionServer.prototype._innerAddExtension):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-18  Andrey Kosyakov  <caseq@chromium.org>
+
+        Web Inspector: [Extensions API] postpone requests to add extensions until extension server is initialized
+        https://bugs.webkit.org/show_bug.cgi?id=97012
+
+        Reviewed by Vsevolod Vlasov.
+
+        - queue extensions being added unless initialization is complete;
+        - add queued extensions upon completion of initialization;
+
+        * inspector/front-end/ExtensionServer.js:
+        (WebInspector.ExtensionServer.prototype.initExtensions):
+        (WebInspector.ExtensionServer.prototype._addExtensions):
+        (WebInspector.ExtensionServer.prototype._addExtension):
+        (WebInspector.ExtensionServer.prototype._innerAddExtension):
+
 2012-09-18  Christophe Dumez  <christophe.dumez@intel.com>
 

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

@@ -611 +611 @@
             this._inspectedURLChanged, this);
         WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
+        this._initDone = true;
+        if (this._pendingExtensions) {
+            this._pendingExtensions.forEach(this._innerAddExtension, this);
+            delete this._pendingExtensions;
+        }
         InspectorExtensionRegistry.getExtensionsAsync();
     },
@@ -653 +658 @@
     _addExtensions: function(extensions)
     {
-        for (var i = 0; i < extensions.length; ++i)
-            this._addExtension(extensions[i]);
+        extensions.forEach(this._addExtension, this);
     },
 
     _addExtension: function(extensionInfo)
+    {
+        if (this._initDone) {
+            this._innerAddExtension(extensionInfo);
+            return;
+        }
+        if (this._pendingExtensions)
+            this._pendingExtensions.push(extensionInfo);
+        else
+            this._pendingExtensions = [extensionInfo];
+    },
+
+    _innerAddExtension: function(extensionInfo)
     {
         const urlOriginRegExp = new RegExp("([^:]+:\/\/[^/]*)\/"); // Can't use regexp literal here, MinJS chokes on it.