DevTools: make extension server a part of core, panels' code should depend on it.

Source/devtools/front_end/extensions/ExtensionServer.js

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @constructor
- * @implements {WebInspector.ExtensionServerAPI}
+ * @extends {WebInspector.Object}
  */
 WebInspector.ExtensionServer = function()
 {
     this._clientObjects = {};
     this._handlers = {};
     this._subscribers = {};
     this._subscriptionStartHandlers = {};
     this._subscriptionStopHandlers = {};
     this._extraHeaders = {};
     this._requests = {};
     this._lastRequestId = 0;
     this._registeredExtensions = {};
     this._status = new WebInspector.ExtensionStatus();
+    /** @type {!Array.<!WebInspector.ExtensionSidebarPane>} */
+    this._sidebarPanes = [];
+    /** @type {!Array.<!WebInspector.ExtensionAuditCategory>} */
+    this._auditCategories = [];
 
     var commands = WebInspector.extensionAPI.Commands;
 
     this._registerHandler(commands.AddAuditCategory, this._onAddAuditCategory.bind(this));
     this._registerHandler(commands.AddAuditResult, this._onAddAuditResult.bind(this));
     this._registerHandler(commands.AddConsoleMessage, this._onAddConsoleMessage.bind(this));
     this._registerHandler(commands.AddRequestHeaders, this._onAddRequestHeaders.bind(this));
     this._registerHandler(commands.ApplyStyleSheet, this._onApplyStyleSheet.bind(this));
     this._registerHandler(commands.CreatePanel, this._onCreatePanel.bind(this));
     this._registerHandler(commands.CreateSidebarPane, this._onCreateSidebarPane.bind(this));
@@ skipping 16 matching lines @@
     this._registerHandler(commands.Subscribe, this._onSubscribe.bind(this));
     this._registerHandler(commands.OpenResource, this._onOpenResource.bind(this));
     this._registerHandler(commands.Unsubscribe, this._onUnsubscribe.bind(this));
     this._registerHandler(commands.UpdateButton, this._onUpdateButton.bind(this));
     this._registerHandler(commands.UpdateAuditProgress, this._onUpdateAuditProgress.bind(this));
     window.addEventListener("message", this._onWindowMessage.bind(this), false);
 
     this._initExtensions();
 }
 
+WebInspector.ExtensionServer.Events = {
+    SidebarPaneAdded: "SidebarPaneAdded",
+    AuditCategoryAdded: "AuditCategoryAdded"
+}
+
 WebInspector.ExtensionServer.prototype = {
     /**
      * @return {boolean}
      */
     hasExtensions: function()
     {
         return !!Object.keys(this._registeredExtensions).length;
     },
 
     /**
@@ skipping 33 matching lines @@
 
     _inspectedURLChanged: function(event)
     {
         this._requests = {};
         var url = event.data;
         this._postNotification(WebInspector.extensionAPI.Events.InspectedURLChanged, url);
     },
 
 
     /**
-     * @param {!WebInspector.ExtensionAuditCategory} category
+     * @param {string} categoryId
      * @param {!WebInspector.ExtensionAuditCategoryResults} auditResults
      */
-    startAuditRun: function(category, auditResults)
+    startAuditRun: function(categoryId, auditResults)
     {
-        this._clientObjects[auditResults.id] = auditResults;
-        this._postNotification("audit-started-" + category.id, auditResults.id);
+        this._clientObjects[auditResults.id()] = auditResults;
+        this._postNotification("audit-started-" + categoryId, auditResults.id());
     },
 
     /**
      * @param {!WebInspector.ExtensionAuditCategoryResults} auditResults
      */
     stopAuditRun: function(auditResults)
     {
-        delete this._clientObjects[auditResults.id];
+        delete this._clientObjects[auditResults.id()];
     },
 
     /**
      * @param {string} type
      * @return {boolean}
      */
     hasSubscribers: function(type)
     {
         return !!this._subscribers[type];
     },
@@ skipping 119 matching lines @@
         if (!button || !(button instanceof WebInspector.ExtensionButton))
             return this._status.E_NOTFOUND(message.id);
         button.update(this._expandResourcePath(port._extensionOrigin, message.icon), message.tooltip, message.disabled);
         return this._status.OK();
     },
 
     _onCreateSidebarPane: function(message)
     {
         if (message.panel !== "elements" && message.panel !== "sources")
             return this._status.E_NOTFOUND(message.panel);
-        var panel = message.panel === "elements" ? WebInspector.ElementsPanel.instance() : WebInspector.SourcesPanel.instance();
         var id = message.id;
-        var sidebar = new WebInspector.ExtensionSidebarPane(this, message.title, id);
+        var sidebar = new WebInspector.ExtensionSidebarPane(this, message.panel, message.title, id);
+        this._sidebarPanes.push(sidebar);
         this._clientObjects[id] = sidebar;
-        panel.addExtensionSidebarPane(id, sidebar);
+        this.dispatchEventToListeners(WebInspector.ExtensionServer.Events.SidebarPaneAdded, sidebar);
 
         return this._status.OK();
     },
 
+    /**
+     * @return {!Array.<!WebInspector.ExtensionSidebarPane>}
+     */
+    sidebarPanes: function()
+    {
+        return this._sidebarPanes;
+    },
+
     _onSetSidebarHeight: function(message)
     {
         var sidebar = this._clientObjects[message.id];
         if (!sidebar)
             return this._status.E_NOTFOUND(message.id);
         sidebar.setHeight(message.height);
         return this._status.OK();
     },
 
     _onSetSidebarContent: function(message, port)
@@ skipping 291 matching lines @@
         return request._extensionRequestId;
     },
 
     _requestById: function(id)
     {
         return this._requests[id];
     },
 
     _onAddAuditCategory: function(message, port)
     {
-        var category = new WebInspector.ExtensionAuditCategory(this, port._extensionOrigin, message.id, message.displayName, message.resultCount);
-        if (WebInspector.AuditsPanel.instance().getCategory(category.id))
-            return this._status.E_EXISTS(category.id);
+        var category = new WebInspector.ExtensionAuditCategory(port._extensionOrigin, message.id, message.displayName, message.resultCount);
         this._clientObjects[message.id] = category;
-        WebInspector.AuditsPanel.instance().addCategory(category);
+        this._auditCategories.push(category);
+        this.dispatchEventToListeners(WebInspector.ExtensionServer.Events.AuditCategoryAdded, category);
+    },
+
+    /**
+     * @return {!Array.<!WebInspector.ExtensionAuditCategory>}
+     */
+    auditCategories: function()
+    {
+        return this._auditCategories;
     },
 
     _onAddAuditResult: function(message)
     {
-        var auditResult = this._clientObjects[message.resultId];
+        var auditResult = /** {!WebInspector.ExtensionAuditCategoryResults} */ (this._clientObjects[message.resultId]);
         if (!auditResult)
             return this._status.E_NOTFOUND(message.resultId);
         try {
             auditResult.addResult(message.displayName, message.description, message.severity, message.details);
         } catch (e) {
             return e;
         }
         return this._status.OK();
     },
 
     _onUpdateAuditProgress: function(message)
     {
-        var auditResult = this._clientObjects[message.resultId];
+        var auditResult = /** {!WebInspector.ExtensionAuditCategoryResults} */ (this._clientObjects[message.resultId]);
         if (!auditResult)
             return this._status.E_NOTFOUND(message.resultId);
         auditResult.updateProgress(Math.min(Math.max(0, message.progress), 1));
     },
 
     _onStopAuditCategoryRun: function(message)
     {
-        var auditRun = this._clientObjects[message.resultId];
+        var auditRun = /** {!WebInspector.ExtensionAuditCategoryResults} */ (this._clientObjects[message.resultId]);
         if (!auditRun)
             return this._status.E_NOTFOUND(message.resultId);
         auditRun.done();
     },
 
     _onForwardKeyboardEvent: function(message)
     {
         const Esc = "U+001B";
         message.entries.forEach(handleEventEntry);
 
@@ skipping 54 matching lines @@
         /**
          * @this {WebInspector.ExtensionServer}
          */
         function onElementsSubscriptionStopped()
         {
             WebInspector.notifications.removeEventListener(WebInspector.NotificationService.Events.SelectedNodeChanged, this._notifyElementsSelectionChanged, this);
         }
 
         this._registerSubscriptionHandler(WebInspector.extensionAPI.Events.PanelObjectSelected + "elements",
             onElementsSubscriptionStarted.bind(this), onElementsSubscriptionStopped.bind(this));
-
-        this._registerAutosubscriptionHandler(WebInspector.extensionAPI.Events.PanelObjectSelected + "sources",
-            WebInspector.notifications,
-            WebInspector.SourceFrame.Events.SelectionChanged,
-            this._notifySourceFrameSelectionChanged);
         this._registerResourceContentCommittedHandler(this._notifyUISourceCodeContentCommitted);
 
         WebInspector.targetManager.addEventListener(WebInspector.TargetManager.Events.InspectedURLChanged,
             this._inspectedURLChanged, this);
 
         InspectorExtensionRegistry.getExtensionsAsync();
     },
 
-    /**
-     * @param {!WebInspector.TextRange} textRange
-     */
-    _makeSourceSelection: function(textRange)
-    {
-        var sourcesPanel = WebInspector.SourcesPanel.instance();
-        var selection = {
-            startLine: textRange.startLine,
-            startColumn: textRange.startColumn,
-            endLine: textRange.endLine,
-            endColumn: textRange.endColumn,
-            url: sourcesPanel.sourcesView().currentUISourceCode().uri()
-        };
-
-        return selection;
-    },
-
-    _notifySourceFrameSelectionChanged: function(event)

[caseq, 2014/10/20 09:20:10]

Please state the fact that we remove support for sources panel selection in the
CL description.

-    {
-        this._postNotification(WebInspector.extensionAPI.Events.PanelObjectSelected + "sources", this._makeSourceSelection(event.data));
-    },
-
     _notifyConsoleMessageAdded: function(event)
     {
         this._postNotification(WebInspector.extensionAPI.Events.ConsoleMessageAdded, this._makeConsoleMessage(event.data));
     },
 
     _notifyResourceAdded: function(event)
     {
         var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data);
         this._postNotification(WebInspector.extensionAPI.Events.ResourceAdded, this._makeResource(uiSourceCode));
     },
@@ skipping 12 matching lines @@
     },
 
     _notifyElementsSelectionChanged: function()
     {
         this._postNotification(WebInspector.extensionAPI.Events.PanelObjectSelected + "elements");
     },
 
     /**
      * @param {!Array.<!ExtensionDescriptor>} extensionInfos
      */
-    addExtensions: function(extensionInfos)
+    _addExtensions: function(extensionInfos)
     {
         extensionInfos.forEach(this._addExtension, this);
     },
 
     /**
      * @param {!ExtensionDescriptor} extensionInfo
      */
     _addExtension: function(extensionInfo)
     {
         const urlOriginRegExp = new RegExp("([^:]+:\/\/[^/]*)\/"); // Can't use regexp literal here, MinJS chokes on it.
@@ skipping 209 matching lines @@
                         context = executionContext;
 
                 }
                 if (!context)
                     return this._status.E_FAILED(frame.url + " has no execution context");
             }
 
             contextId = context.id;
         }
         RuntimeAgent.evaluate(expression, "extension", exposeCommandLineAPI, true, contextId, returnByValue, false, callback);
-    }
+    },
+
+    __proto__: WebInspector.Object.prototype
 }
 
 /**
  * @constructor
  * @param {string} name
  * @param {string} title
  * @param {!WebInspector.Panel} panel
  * @implements {WebInspector.PanelDescriptor}
  */
 WebInspector.ExtensionServerPanelDescriptor = function(name, title, panel)
@@ skipping 60 matching lines @@
     this.E_FAILED = makeStatus.bind(null, "E_FAILED", "Operation failed: %s");
 }
 
 /**
  * @typedef {{code: string, description: string, details: !Array.<*>}}
  */
 WebInspector.ExtensionStatus.Record;
 
 WebInspector.extensionAPI = {};
 defineCommonExtensionSymbols(WebInspector.extensionAPI);
+
+WebInspector.addExtensions = function(extensions)
+{
+    if (WebInspector.extensionServer._overridePlatformExtensionAPIForTest)
+        window.buildPlatformExtensionAPI = WebInspector.extensionServer._overridePlatformExtensionAPIForTest;
+    WebInspector.extensionServer._addExtensions(extensions);
+}
+
+WebInspector.setInspectedTabId = function(tabId)
+{
+    WebInspector._inspectedTabId = tabId;
+}