[DevTools] Replace the target type with capabilities

third_party/WebKit/Source/devtools/front_end/components/ExecutionContextSelector.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
  * @implements {WebInspector.TargetManager.Observer}
  * @param {!WebInspector.TargetManager} targetManager
  * @param {!WebInspector.Context} context
  */
 WebInspector.ExecutionContextSelector = function(targetManager, context)
 {
-    targetManager.observeTargets(this);
+    targetManager.observeTargets(this, WebInspector.Target.Capability.JS);
     context.addFlavorChangeListener(WebInspector.ExecutionContext, this._executionContextChanged, this);
     context.addFlavorChangeListener(WebInspector.Target, this._targetChanged, this);
 
     targetManager.addModelListener(WebInspector.RuntimeModel, WebInspector.RuntimeModel.Events.ExecutionContextCreated, this._onExecutionContextCreated, this);
     targetManager.addModelListener(WebInspector.RuntimeModel, WebInspector.RuntimeModel.Events.ExecutionContextDestroyed, this._onExecutionContextDestroyed, this);
     this._targetManager = targetManager;
     this._context = context;
 }
 
 WebInspector.ExecutionContextSelector.prototype = {
 
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
-        if (!target.hasJSContext())
-            return;
         // Defer selecting default target since we need all clients to get their
         // targetAdded notifications first.
         setImmediate(deferred.bind(this));
 
         /**
          * @this {WebInspector.ExecutionContextSelector}
          */
         function deferred()
         {
             // We always want the second context for the service worker targets.
             if (!this._context.flavor(WebInspector.Target))
                 this._context.setFlavor(WebInspector.Target, target);
         }
     },
 
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetRemoved: function(target)
     {
-        if (!target.hasJSContext())
-            return;
         var currentExecutionContext = this._context.flavor(WebInspector.ExecutionContext);
         if (currentExecutionContext && currentExecutionContext.target() === target)
             this._currentExecutionContextGone();
 
-        var targets = this._targetManager.targetsWithJSContext();
+        var targets = this._targetManager.targets(WebInspector.Target.Capability.JS);
         if (this._context.flavor(WebInspector.Target) === target && targets.length)
             this._context.setFlavor(WebInspector.Target, targets[0]);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _executionContextChanged: function(event)
     {
         var newContext = /** @type {?WebInspector.ExecutionContext} */ (event.data);
@@ skipping 87 matching lines @@
      */
     _onExecutionContextDestroyed: function(event)
     {
         var executionContext = /** @type {!WebInspector.ExecutionContext}*/ (event.data);
         if (this._context.flavor(WebInspector.ExecutionContext) === executionContext)
             this._currentExecutionContextGone();
     },
 
     _currentExecutionContextGone: function()
     {
-        var targets = this._targetManager.targetsWithJSContext();
+        var targets = this._targetManager.targets(WebInspector.Target.Capability.JS);
         var newContext = null;
         for (var i = 0; i < targets.length && !newContext; ++i) {
-            if (targets[i].isServiceWorker())
+            if (!targets[i].hasJSCapability())

[dgozman, 2016/07/13 00:08:29]

It should have it due to parameter passed to targets().

[eostroukhov-old, 2016/07/13 00:36:29]

Done.

                 continue;
             var executionContexts = targets[i].runtimeModel.executionContexts();
             for (var executionContext of executionContexts) {
                 if (this._isMainFrameContext(executionContext)) {
                     newContext = executionContext;
                     break;
                 }
             }
         }
         if (!newContext) {
@@ skipping 32 matching lines @@
     var expressionString = expressionRange.toString();
 
     // The "[" is also a stop character, except when it's the last character of the expression.
     var pos = expressionString.lastIndexOf("[", expressionString.length - 2);
     if (pos !== -1)
         expressionString = expressionString.substr(pos + 1);
 
     var prefix = wordRange.toString();
     executionContext.completionsForExpression(expressionString, text, cursorOffset, prefix, force, completionsReadyCallback);
 }