[DevTools] Replace the target type with capabilities

third_party/WebKit/Source/devtools/front_end/main/Main.js

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 290 matching lines @@
         /**
          * @param {!WebInspector.Event} event
          */
         function onDisconnected(event)
         {
             if (WebInspector._disconnectedScreenWithReasonWasShown)
                 return;
             WebInspector.RemoteDebuggingTerminatedScreen.show(event.data.reason);
         }
 
-        var targetType = WebInspector.Target.Type.Page;
+        var capabilities = WebInspector.Target.Capability.Browser | WebInspector.Target.Capability.JS | WebInspector.Target.Capability.Network | WebInspector.Target.Capability.Worker;
         if (Runtime.queryParam("isSharedWorker"))
-            targetType = WebInspector.Target.Type.ServiceWorker;
+            capabilities = WebInspector.Target.Capability.Network | WebInspector.Target.Capability.Worker;
         else if (Runtime.queryParam("v8only"))
-            targetType = WebInspector.Target.Type.JSInspector;
+            capabilities = WebInspector.Target.Capability.JS;
 
-        this._mainTarget = WebInspector.targetManager.createTarget(WebInspector.UIString("Main"), targetType, connection, null);
+        this._mainTarget = WebInspector.targetManager.createTarget(WebInspector.UIString("Main"), capabilities, connection, null);
         console.timeStamp("Main._mainTargetCreated");
         this._registerShortcuts();
 
         this._mainTarget.registerInspectorDispatcher(this);
         InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.ReloadInspectedPage, this._reloadInspectedPage, this);
         InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.EvaluateForTestInFrontend, this._evaluateForTestInFrontend, this);
 
-        if (this._mainTarget.isServiceWorker() || this._mainTarget.isPage() || this._mainTarget.isJSInspector())
-            this._mainTarget.runtimeAgent().run();
+        this._mainTarget.runtimeAgent().run();
 
         this._mainTarget.inspectorAgent().enable();
         InspectorFrontendHost.readyForTest();
 
         // Asynchronously run the extensions.
         setTimeout(lateInitialization, 0);
 
         function lateInitialization()
         {
             console.timeStamp("Main.lateInitialization");
@@ skipping 367 matching lines @@
     }
 }
 
 /**
  * @param {boolean} hard
  */
 WebInspector.Main._reloadPage = function(hard)
 {
     if (!WebInspector.targetManager.hasTargets())
         return;
-    if (WebInspector.targetManager.mainTarget().isServiceWorker())
-        return;
-    WebInspector.targetManager.reloadPage(hard);
+    if (WebInspector.targetManager.mainTarget().hasBrowserCapability())
+        WebInspector.targetManager.reloadPage(hard);
 }
 
 /**
  * @param {string} ws
  */
 WebInspector.Main._addWebSocketTarget = function(ws)

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

Looks like this method is never called. Remove it please.

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

Done.

 {
     /**
      * @param {!InspectorBackendClass.Connection} connection
      */
     function callback(connection)
     {
-        WebInspector.targetManager.createTarget(ws, WebInspector.Target.Type.Page, connection, null);
+        var capabilities = WebInspector.Target.Capability.Browser | WebInspector.Target.Capability.JS | WebInspector.Target.Capability.Network | WebInspector.Target.Capability.Worker;
+        WebInspector.targetManager.createTarget(ws, capabilities, connection, null);
     }
     new WebInspector.WebSocketConnection(ws, callback);
 }
 
 /**
  * @constructor
  * @implements {WebInspector.ToolbarItem.Provider}
  */
 WebInspector.Main.WarningErrorCounter = function()
 {
@@ skipping 317 matching lines @@
  * @implements {WebInspector.TargetManager.Observer}
  */
 WebInspector.BackendSettingsSync = function()
 {
     this._autoAttachSetting = WebInspector.settings.moduleSetting("autoAttachToCreatedPages");
     this._autoAttachSetting.addChangeListener(this._update, this);
     this._disableJavascriptSetting = WebInspector.settings.moduleSetting("javaScriptDisabled");
     this._disableJavascriptSetting.addChangeListener(this._update, this);
     this._blockedEventsWarningSetting = WebInspector.settings.moduleSetting("blockedEventsWarningEnabled");
     this._blockedEventsWarningSetting.addChangeListener(this._update, this);
-    WebInspector.targetManager.observeTargets(this, WebInspector.Target.Type.Page);
+    WebInspector.targetManager.observeTargets(this, WebInspector.Target.Capability.Browser);
 }
 
 WebInspector.BackendSettingsSync.prototype = {
     /**
      * @param {!WebInspector.Target} target
      */
     _updateTarget: function(target)
     {
         var blockedEventsWarningThresholdSeconds = 0.1;
         target.pageAgent().setBlockedEventsWarningThreshold(this._blockedEventsWarningSetting.get() ? blockedEventsWarningThresholdSeconds : 0);
         target.pageAgent().setAutoAttachToCreatedPages(this._autoAttachSetting.get());
         target.emulationAgent().setScriptExecutionDisabled(this._disableJavascriptSetting.get());
     },
 
     _update: function()
     {
-        WebInspector.targetManager.targets(WebInspector.Target.Type.Page).forEach(this._updateTarget, this);
+        WebInspector.targetManager.targets(WebInspector.Target.Capability.Browser).forEach(this._updateTarget, this);
     },
 
     /**
      * @param {!WebInspector.Target} target
      * @override
      */
     targetAdded: function(target)
     {
         this._updateTarget(target);
         target.renderingAgent().setShowViewportSizeOnResize(true);
@@ skipping 22 matching lines @@
      * @return {?Element}
      */
     settingElement: function()
     {
         return WebInspector.SettingsUI.createSettingCheckbox(WebInspector.UIString("Show rulers"), WebInspector.moduleSetting("showMetricsRulers"));
     }
 }
 
 
 new WebInspector.Main();