Changeset 145712 in webkit

Timestamp:

Mar 13, 2013 6:38:33 AM (11 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: convert workers inspection into capability
​https://bugs.webkit.org/show_bug.cgi?id=112251

Reviewed by Vsevolod Vlasov.

Source/WebCore:

It should be up to backend

• inspector/Inspector.json:
• inspector/InspectorFrontendClient.h:

(InspectorFrontendClient):

• inspector/InspectorFrontendClientLocal.h:
• inspector/InspectorFrontendHost.cpp:
• inspector/InspectorFrontendHost.h:

(InspectorFrontendHost):

• inspector/InspectorFrontendHost.idl:
• inspector/InspectorWorkerAgent.cpp:

(WebCore::InspectorWorkerAgent::canInspectWorkers):
(WebCore):

• inspector/InspectorWorkerAgent.h:

(InspectorWorkerAgent):

• inspector/front-end/InspectorFrontendHostStub.js:
• inspector/front-end/Settings.js:
• inspector/front-end/externs.js:
• inspector/front-end/inspector.js:

(WebInspector.doLoadedDone):

Source/WebKit/chromium:

• src/InspectorFrontendClientImpl.cpp:
• src/InspectorFrontendClientImpl.h:

(InspectorFrontendClientImpl):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/Inspector.json (modified) (1 diff)
• WebCore/inspector/InspectorFrontendClient.h (modified) (1 diff)
• WebCore/inspector/InspectorFrontendClientLocal.h (modified) (1 diff)
• WebCore/inspector/InspectorFrontendHost.cpp (modified) (1 diff)
• WebCore/inspector/InspectorFrontendHost.h (modified) (1 diff)
• WebCore/inspector/InspectorFrontendHost.idl (modified) (2 diffs)
• WebCore/inspector/InspectorWorkerAgent.cpp (modified) (1 diff)
• WebCore/inspector/InspectorWorkerAgent.h (modified) (1 diff)
• WebCore/inspector/front-end/InspectorFrontendHostStub.js (modified) (1 diff)
• WebCore/inspector/front-end/ScriptsPanel.js (modified) (2 diffs)
• WebCore/inspector/front-end/Settings.js (modified) (1 diff)
• WebCore/inspector/front-end/externs.js (modified) (1 diff)
• WebCore/inspector/front-end/inspector.js (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/InspectorFrontendClientImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/InspectorFrontendClientImpl.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-13  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: convert workers inspection into capability
+        https://bugs.webkit.org/show_bug.cgi?id=112251
+
+        Reviewed by Vsevolod Vlasov.
+
+        It should be up to backend
+
+        * inspector/Inspector.json:
+        * inspector/InspectorFrontendClient.h:
+        (InspectorFrontendClient):
+        * inspector/InspectorFrontendClientLocal.h:
+        * inspector/InspectorFrontendHost.cpp:
+        * inspector/InspectorFrontendHost.h:
+        (InspectorFrontendHost):
+        * inspector/InspectorFrontendHost.idl:
+        * inspector/InspectorWorkerAgent.cpp:
+        (WebCore::InspectorWorkerAgent::canInspectWorkers):
+        (WebCore):
+        * inspector/InspectorWorkerAgent.h:
+        (InspectorWorkerAgent):
+        * inspector/front-end/InspectorFrontendHostStub.js:
+        * inspector/front-end/Settings.js:
+        * inspector/front-end/externs.js:
+        * inspector/front-end/inspector.js:
+        (WebInspector.doLoadedDone):
+
 2013-03-13  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
 

trunk/Source/WebCore/inspector/Inspector.json

@@ -3376 +3376 @@
                     { "name": "workerId", "type": "integer" },
                     { "name": "message", "type": "object" }
+                ]
+            },
+            {
+                "name": "canInspectWorkers",
+                "description": "Tells whether browser supports workers inspection.",
+                "returns": [
+                    { "name": "result", "type": "boolean", "description": "True if browser has workers support." }
                 ]
             },

trunk/Source/WebCore/inspector/InspectorFrontendClient.h

@@ -67 +67 @@
     virtual void save(const WTF::String& url, const WTF::String& content, bool forceSaveAs) = 0;
     virtual void append(const WTF::String& url, const WTF::String& content) = 0;
-    virtual bool canInspectWorkers() = 0;
 
     virtual void inspectedURLChanged(const String&) = 0;

trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.h

@@ -70 +70 @@
     virtual void save(const String&, const String&, bool) { }
     virtual void append(const String&, const String&) { }
-    virtual bool canInspectWorkers() { return false; }
 
     virtual void attachWindow() = 0;

trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp

@@ -251 +251 @@
 }
 
-bool InspectorFrontendHost::canInspectWorkers()
-{
-#if ENABLE(WORKERS)
-    if (m_client)
-        return m_client->canInspectWorkers();
-    return false;
-#else
-    return false;
-#endif
-}
-
 void InspectorFrontendHost::sendMessageToBackend(const String& message)
 {

trunk/Source/WebCore/inspector/InspectorFrontendHost.h

@@ -79 +79 @@
     void close(const String& url);
 
-    bool canInspectWorkers();
-
     // Called from [Custom] implementations.
     void showContextMenu(Event*, const Vector<ContextMenuItem>& items);

trunk/Source/WebCore/inspector/InspectorFrontendHost.idl

@@ -56 +56 @@
     void close(in DOMString url);
 
-    boolean canInspectWorkers();
-
     [Custom] DOMString platform();
     [Custom] DOMString port();
@@ -66 +64 @@
     [Custom] void recordPanelShown(in unsigned long panelCode);
     [Custom] void recordSettingChanged(in unsigned long settingChanged);
-    
+
     DOMString loadResourceSynchronously(in DOMString url);
 

trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp

@@ -159 +159 @@
 }
 
+void InspectorWorkerAgent::canInspectWorkers(ErrorString*, bool* result)
+{
+#if ENABLE(WORKERS)
+    *result = true;
+#else
+    *result = false;
+#endif
+}
+
 void InspectorWorkerAgent::connectToWorker(ErrorString* error, int workerId)
 {

trunk/Source/WebCore/inspector/InspectorWorkerAgent.h

@@ -65 +65 @@
     virtual void enable(ErrorString*);
     virtual void disable(ErrorString*);
+    virtual void canInspectWorkers(ErrorString*, bool*);
     virtual void connectToWorker(ErrorString*, int workerId);
     virtual void disconnectFromWorker(ErrorString*, int workerId);

trunk/Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js

@@ -222 +222 @@
     },
 
-    canInspectWorkers: function()
-    {
-        return true;
-    },
-
     isUnderTest: function()
     {

trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js

@@ -116 +116 @@
     this.sidebarPanes.eventListenerBreakpoints = new WebInspector.EventListenerBreakpointsSidebarPane();
 
-    if (InspectorFrontendHost.canInspectWorkers() && !WebInspector.WorkerManager.isWorkerFrontend()) {
+    if (Capabilities.canInspectWorkers && !WebInspector.WorkerManager.isWorkerFrontend()) {
         WorkerAgent.enable();
         this.sidebarPanes.workerList = new WebInspector.WorkersSidebarPane(WebInspector.workerManager);
@@ -1314 +1314 @@
             group2.addPane(this.sidebarPanes.xhrBreakpoints);
             group2.addPane(this.sidebarPanes.eventListenerBreakpoints);
+            group2.addPane(this.sidebarPanes.workerList);
 
             this.sidebarPaneView.firstElement().appendChild(this.debugToolbar);

trunk/Source/WebCore/inspector/front-end/Settings.js

@@ -63 +63 @@
     canShowDebugBorders: false,
     canShowFPSCounter: false,
-    canContinuouslyPaint: false
+    canContinuouslyPaint: false,
+    canInspectWorkers: false
 }
 

trunk/Source/WebCore/inspector/front-end/externs.js

@@ -193 +193 @@
 InspectorFrontendHostAPI.prototype.isolatedFileSystem = function(fileSystemId, registeredName) {}
 InspectorFrontendHostAPI.prototype.setZoomFactor = function(zoom) {}
-InspectorFrontendHostAPI.prototype.canInspectWorkers = function() {}
 /** @type {InspectorFrontendHostAPI} */
 var InspectorFrontendHost;

trunk/Source/WebCore/inspector/front-end/inspector.js

@@ -409 +409 @@
     PageAgent.canOverrideDeviceMetrics(WebInspector._initializeCapability.bind(WebInspector, "canOverrideDeviceMetrics", null));
     PageAgent.canOverrideGeolocation(WebInspector._initializeCapability.bind(WebInspector, "canOverrideGeolocation", null));
+    WorkerAgent.canInspectWorkers(WebInspector._initializeCapability.bind(WebInspector, "canInspectWorkers", null));
     PageAgent.canOverrideDeviceOrientation(WebInspector._initializeCapability.bind(WebInspector, "canOverrideDeviceOrientation", WebInspector._doLoadedDoneWithCapabilities.bind(WebInspector)));
 }

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-03-13  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: convert workers inspection into capability
+        https://bugs.webkit.org/show_bug.cgi?id=112251
+
+        Reviewed by Vsevolod Vlasov.
+
+        * src/InspectorFrontendClientImpl.cpp:
+        * src/InspectorFrontendClientImpl.h:
+        (InspectorFrontendClientImpl):
+
 2013-03-12  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/chromium/src/InspectorFrontendClientImpl.cpp

@@ -140 +140 @@
 }
 
-bool InspectorFrontendClientImpl::canInspectWorkers()
-{
-    return true;
-}
-
 void InspectorFrontendClientImpl::inspectedURLChanged(const String& url)
 {

trunk/Source/WebKit/chromium/src/InspectorFrontendClientImpl.h

@@ -71 +71 @@
     virtual void save(const WTF::String& urk, const WTF::String& content, bool forceSaveAs);
     virtual void append(const WTF::String& urk, const WTF::String& content);
-    virtual bool canInspectWorkers();
 
     virtual void inspectedURLChanged(const WTF::String&);