[DevTools] Replace the target type with capabilities

third_party/WebKit/Source/devtools/front_end/sdk/RuntimeModel.js

 /*
  * Copyright (C) 2012 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 21 matching lines @@
  * @constructor
  * @extends {WebInspector.SDKModel}
  * @param {!WebInspector.Target} target
  */
 WebInspector.RuntimeModel = function(target)
 {
     WebInspector.SDKModel.call(this, WebInspector.RuntimeModel, target);
 
     this._agent = target.runtimeAgent();
     this.target().registerRuntimeDispatcher(new WebInspector.RuntimeDispatcher(this));
-    if (target.hasJSContext())
+    if (target.hasJSDomains())
         this._agent.enable();
     /**
      * @type {!Object.<number, !WebInspector.ExecutionContext>}
      */
     this._executionContextById = {};
 
     if (WebInspector.moduleSetting("customFormatters").get())
         this._agent.setCustomObjectFormatterEnabled(true);
 
     WebInspector.moduleSetting("customFormatters").addChangeListener(this._customFormattersStateChanged.bind(this));
@@ skipping 382 matching lines @@
  * @return {number}
  */
 WebInspector.ExecutionContext.comparator = function(a, b)
 {
     /**
      * @param {!WebInspector.Target} target
      * @return {number}
      */
     function targetWeight(target)
     {
-        if (target.isPage())
+        if (target.hasBrowserDomains())
             return 3;
-        if (target.isDedicatedWorker())
+        if (!target.hasJSDomains())

[dgozman, 2016/07/12 00:34:11]

This should be inverted.

[eostroukhov-old, 2016/07/12 21:46:15]

Done.

             return 2;
         return 1;
     }
 
     var weightDiff = targetWeight(a.target()) - targetWeight(b.target());
     if (weightDiff)
         return -weightDiff;
 
     var frameIdDiff = String.hashCode(a.frameId) - String.hashCode(b.frameId);
     if (frameIdDiff)
@@ skipping 404 matching lines @@
     },
 
     /**
      * @return {!Promise<undefined>}
      */
     remove: function()
     {
         if (!this._removeFunction)
             return Promise.resolve();
         return this._removeFunction.callFunctionPromise(callCustomRemove, [
-                WebInspector.RemoteObject.toCallArgument(this._type),
-                WebInspector.RemoteObject.toCallArgument(this._originalHandler),
-                WebInspector.RemoteObject.toCallArgument(this._useCapture),
-                WebInspector.RemoteObject.toCallArgument(this._passive),
-            ]).then(() => undefined);
+            WebInspector.RemoteObject.toCallArgument(this._type),
+            WebInspector.RemoteObject.toCallArgument(this._originalHandler),
+            WebInspector.RemoteObject.toCallArgument(this._useCapture),
+            WebInspector.RemoteObject.toCallArgument(this._passive),
+        ]).then(() => undefined);
 
         /**
          * @param {string} type
          * @param {function()} listener
          * @param {boolean} useCapture
          * @param {boolean} passive
          * @this {Function}
          * @suppressReceiverCheck
          */
         function callCustomRemove(type, listener, useCapture, passive)
@@ skipping 65 matching lines @@
     /**
      * @return {boolean}
      */
     isNormalListenerType: function()
     {
         return this._listenerType === "normal";
     },
 
     __proto__: WebInspector.SDKObject.prototype
 }