DevTools: get rid of the global capabilities set.

Source/devtools/front_end/sdk/Target.js

 /*
  * Copyright 2014 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /**
  * @constructor
  * @extends {Protocol.Agents}
  * @param {string} name
  * @param {!InspectorBackendClass.Connection} connection
  * @param {function(!WebInspector.Target)=} callback
  */
 WebInspector.Target = function(name, connection, callback)
 {
     Protocol.Agents.call(this, connection.agentsMap());
     this._name = name;
     this._connection = connection;
-    /** @type {boolean} */
-    this.isMainFrontend = false;
     this._id = WebInspector.Target._nextId++;
-    /** @type {boolean} */
-    this.canScreencast = false;
-    this.pageAgent().canScreencast(this._initializeCapability.bind(this, "canScreencast", null));
-
-    /** @type {boolean} */
-    this.hasTouchInputs = false;
-    this.pageAgent().hasTouchInputs(this._initializeCapability.bind(this, "hasTouchInputs", null));
-
+    this.pageAgent().canScreencast(this._initializeCapability.bind(this, WebInspector.Target.Capabilities.canScreencast, null));
+    this.pageAgent().hasTouchInputs(this._initializeCapability.bind(this, WebInspector.Target.Capabilities.hasTouchInputs, null));
     if (WebInspector.experimentsSettings.timelinePowerProfiler.isEnabled())
-        this.powerAgent().canProfilePower(this._initializeCapability.bind(this, "canProfilePower", null));
-
-    this.workerAgent().canInspectWorkers(this._initializeCapability.bind(this, "isMainFrontend", this._loadedWithCapabilities.bind(this, callback)));
+        this.powerAgent().canProfilePower(this._initializeCapability.bind(this, WebInspector.Target.Capabilities.canProfilePower, null));
+    this.workerAgent().canInspectWorkers(this._initializeCapability.bind(this, WebInspector.Target.Capabilities.canInspectWorkers, this._loadedWithCapabilities.bind(this, callback)));
 
     /** @type {!WebInspector.Lock} */
     this.profilingLock = new WebInspector.Lock();
+    this._capabilities = {};

[dgozman, 2014/07/14 20:47:11]

I'd move this before initializeCapability calls and annotate.

[pfeldman, 2014/07/15 04:53:13]

Done.

+}
+
+/**
+ * @enum {string}
+ */
+WebInspector.Target.Capabilities = {
+    canScreencast: "canScreencast",
+    hasTouchInputs: "hasTouchInputs",
+    canProfilePower: "canProfilePower",
+    canInspectWorkers: "canInspectWorkers"
 }
 
 WebInspector.Target._nextId = 1;
 
 WebInspector.Target.prototype = {
 
     /**
      * @return {number}
      */
     id: function()
@@ skipping 11 matching lines @@
     },
 
     /**
      * @param {string} name
      * @param {function()|null} callback
      * @param {?Protocol.Error} error
      * @param {*} result
      */
     _initializeCapability: function(name, callback, error, result)
     {
-        this[name] = result;
-        if (!Capabilities[name])
-            Capabilities[name] = result;
+        this._capabilities[name] = result;
         if (callback)
             callback();
     },
 
     /**
+     * @param {string} capability
+     * @return {boolean}
+     */
+    hasCapability: function(capability)
+    {
+        return !!this._capabilities[capability];
+    },
+
+    /**
      * @param {function(!WebInspector.Target)=} callback
      */
     _loadedWithCapabilities: function(callback)
     {
         /** @type {!WebInspector.ConsoleModel} */
         this.consoleModel = new WebInspector.ConsoleModel(this);
         // This and similar lines are needed for compatibility.
         if (!WebInspector.consoleModel)
             WebInspector.consoleModel = this.consoleModel;
 
@@ skipping 26 matching lines @@
         this.domModel = new WebInspector.DOMModel(this);
         if (!WebInspector.domModel)
             WebInspector.domModel = this.domModel;
 
         /** @type {!WebInspector.CSSStyleModel} */
         this.cssModel = new WebInspector.CSSStyleModel(this);
         if (!WebInspector.cssModel)
             WebInspector.cssModel = this.cssModel;
 
         /** @type {!WebInspector.WorkerManager} */
-        this.workerManager = new WebInspector.WorkerManager(this, this.isMainFrontend);
+        this.workerManager = new WebInspector.WorkerManager(this, this.hasCapability(WebInspector.Target.Capabilities.canInspectWorkers));
         if (!WebInspector.workerManager)
             WebInspector.workerManager = this.workerManager;
 
-        if (this.canProfilePower)
+        if (this.hasCapability(WebInspector.Target.Capabilities.canProfilePower))
             WebInspector.powerProfiler = new WebInspector.PowerProfiler();
 
         /** @type {!WebInspector.TimelineManager} */
         this.timelineManager = new WebInspector.TimelineManager(this);
         if (!WebInspector.timelineManager)
             WebInspector.timelineManager = this.timelineManager;
 
         /** @type {!WebInspector.DatabaseModel} */
         this.databaseModel = new WebInspector.DatabaseModel(this);
         if (!WebInspector.databaseModel)
@@ skipping 24 matching lines @@
     registerDispatcher: function(domain, dispatcher)
     {
         this._connection.registerDispatcher(domain, dispatcher);
     },
 
     /**
      * @return {boolean}
      */
     isWorkerTarget: function()
     {
-        return !this.isMainFrontend;
+        return !this.hasCapability(WebInspector.Target.Capabilities.canInspectWorkers);
     },
 
     /**
      * @return {boolean}
      */
     isMobile: function()
     {
         // FIXME: either add a separate capability or rename canScreencast to isMobile.
-        return this.canScreencast;
+        return this.hasCapability(WebInspector.Target.Capabilities.canScreencast);
     },
 
     dispose: function()
     {
         this.debuggerModel.dispose();
         this.networkManager.dispose();
         this.cpuProfilerModel.dispose();
     },
 
     __proto__: Protocol.Agents.prototype
@@ skipping 167 matching lines @@
     target: function()
     {
         return this._target;
     }
 }
 
 /**
  * @type {!WebInspector.TargetManager}
  */
 WebInspector.targetManager = new WebInspector.TargetManager();