Changeset 116237 in webkit

Timestamp:

May 6, 2012 7:54:10 AM (12 years ago)

Author:

caseq@chromium.org

Message:

Web Inspector: take timeline frame mode out of experimental
​https://bugs.webkit.org/show_bug.cgi?id=85707

Reviewed by Pavel Feldman.

Source/WebCore:

• remove "Vertical timeline overview" experiment;
• add supportsFrameInstrumentation capability to InspectorTimelineAgent;
• show frame mode selector conditionally on supportsFrameInstrumentation capability.

• inspector/Inspector.json: Add Timeline.supportsFrameInstrumentation capability;
• inspector/InspectorClient.h: Add supportsFrameInstrumentation();

(InspectorClient):
(WebCore::InspectorClient::supportsFrameInstrumentation):

• inspector/InspectorController.cpp:

(WebCore::InspectorController::InspectorController):

• inspector/InspectorTimelineAgent.cpp:

(WebCore::InspectorTimelineAgent::supportsFrameInstrumentation):
(WebCore):
(WebCore::InspectorTimelineAgent::InspectorTimelineAgent): Added FrameInstrumentationSupport parameter.

• inspector/InspectorTimelineAgent.h:

(WebCore):
(WebCore::InspectorTimelineAgent::create): ditto.
(InspectorTimelineAgent):

• inspector/WorkerInspectorController.cpp: Updated call site for InspectorTimelineAgent::create() to indicate frame instrumentation not supported.

(WebCore::WorkerInspectorController::WorkerInspectorController):

• inspector/front-end/Settings.js:

(WebInspector.ExperimentsSettings): Removed "Vertical Overview" experiment.

• inspector/front-end/TimelineOverviewPane.js: Expose frame mode conditionally on capability, not the experiment.

(WebInspector.TimelineOverviewPane):

• inspector/front-end/inspector.js: Added initialization for Capabilities.timelineSupportsFrameInstrumentation;

(WebInspector.doLoadedDone):

Source/WebKit/chromium:

• exposed supportFrameInstrumentation method to InspectorClient. Client must return true iff the platform will call InspectorInstrumentation::instrumentBeginFrame() upon beginning of frame rendering;

• src/InspectorClientImpl.cpp:

(WebKit::InspectorClientImpl::supportsFrameInstrumentation):
(WebKit):

• src/InspectorClientImpl.h:

(InspectorClientImpl):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/Inspector.json (modified) (1 diff)
• WebCore/inspector/InspectorClient.h (modified) (2 diffs)
• WebCore/inspector/InspectorController.cpp (modified) (1 diff)
• WebCore/inspector/InspectorTimelineAgent.cpp (modified) (4 diffs)
• WebCore/inspector/InspectorTimelineAgent.h (modified) (5 diffs)
• WebCore/inspector/WorkerInspectorController.cpp (modified) (1 diff)
• WebCore/inspector/front-end/Settings.js (modified) (2 diffs)
• WebCore/inspector/front-end/TimelineOverviewPane.js (modified) (1 diff)
• WebCore/inspector/front-end/inspector.js (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/InspectorClientImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/InspectorClientImpl.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-06  Andrey Kosyakov  <caseq@chromium.org>
+
+        Web Inspector: take timeline frame mode out of experimental
+        https://bugs.webkit.org/show_bug.cgi?id=85707
+
+        Reviewed by Pavel Feldman.
+
+        - remove "Vertical timeline overview" experiment;
+        - add supportsFrameInstrumentation capability to InspectorTimelineAgent;
+        - show frame mode selector conditionally on supportsFrameInstrumentation capability.
+
+        * inspector/Inspector.json: Add Timeline.supportsFrameInstrumentation capability;
+        * inspector/InspectorClient.h: Add supportsFrameInstrumentation();
+        (InspectorClient):
+        (WebCore::InspectorClient::supportsFrameInstrumentation):
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::InspectorController):
+        * inspector/InspectorTimelineAgent.cpp:
+        (WebCore::InspectorTimelineAgent::supportsFrameInstrumentation):
+        (WebCore):
+        (WebCore::InspectorTimelineAgent::InspectorTimelineAgent): Added FrameInstrumentationSupport parameter.
+        * inspector/InspectorTimelineAgent.h:
+        (WebCore):
+        (WebCore::InspectorTimelineAgent::create): ditto.
+        (InspectorTimelineAgent):
+        * inspector/WorkerInspectorController.cpp: Updated call site for InspectorTimelineAgent::create() to indicate frame instrumentation not supported.
+        (WebCore::WorkerInspectorController::WorkerInspectorController):
+        * inspector/front-end/Settings.js:
+        (WebInspector.ExperimentsSettings): Removed "Vertical Overview" experiment.
+        * inspector/front-end/TimelineOverviewPane.js: Expose frame mode conditionally on capability, not the experiment.
+        (WebInspector.TimelineOverviewPane):
+        * inspector/front-end/inspector.js: Added initialization for Capabilities.timelineSupportsFrameInstrumentation;
+        (WebInspector.doLoadedDone):
+
 2012-05-06  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/inspector/Inspector.json

@@ -2156 +2156 @@
                 "hidden": true,
                 "description": "Starts calculating various DOM statistics and sending them as part of timeline events."
+            },
+            {
+                "name": "supportsFrameInstrumentation",
+                "returns": [
+                    { "name": "result", "type": "boolean", "description": "True if timeline supports frame instrumentation." }
+                ],
+                "hidden": true,
+                "description": "Tells whether timeline agent supports frame instrumentation."
             }
         ],

trunk/Source/WebCore/inspector/InspectorClient.h

@@ -58 +58 @@
 
     virtual bool canOverrideDeviceMetrics() { return false; }
+
     virtual void overrideDeviceMetrics(int /*width*/, int /*height*/, float /*fontScaleFactor*/, bool /*fitWindow*/)
     {
@@ -67 +68 @@
     }
 
+    virtual bool supportsFrameInstrumentation() { return false; }
+
     bool doDispatchMessageOnFrontendPage(Page* frontendPage, const String& message);
 };

trunk/Source/WebCore/inspector/InspectorController.cpp

@@ -113 +113 @@
     m_agents.append(domStorageAgentPtr.release());
     m_agents.append(InspectorMemoryAgent::create(m_instrumentingAgents.get(), m_state.get(), m_page, m_domAgent));
-    m_agents.append(InspectorTimelineAgent::create(m_instrumentingAgents.get(), m_state.get(), InspectorTimelineAgent::PageInspector));
+    m_agents.append(InspectorTimelineAgent::create(m_instrumentingAgents.get(), m_state.get(), InspectorTimelineAgent::PageInspector,
+       inspectorClient->supportsFrameInstrumentation() ? InspectorTimelineAgent::FrameInstrumentationSupported : InspectorTimelineAgent::FrameInstrumentationNotSupported));
     m_agents.append(InspectorApplicationCacheAgent::create(m_instrumentingAgents.get(), m_state.get(), pageAgent));
 

trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp

@@ -37 +37 @@
 #include "Event.h"
 #include "IdentifiersFactory.h"
+#include "InspectorClient.h"
 #include "InspectorCounters.h"
 #include "InspectorFrontend.h"
@@ -172 +173 @@
 {
     m_state->setBoolean(TimelineAgentState::includeMemoryDetails, value);
+}
+
+void InspectorTimelineAgent::supportsFrameInstrumentation(ErrorString*, bool* result)
+{
+    *result = m_frameInstrumentationSupport == FrameInstrumentationSupported;
 }
 
@@ -438 +444 @@
 }
 
-InspectorTimelineAgent::InspectorTimelineAgent(InstrumentingAgents* instrumentingAgents, InspectorState* state, InspectorType type)
+InspectorTimelineAgent::InspectorTimelineAgent(InstrumentingAgents* instrumentingAgents, InspectorState* state, InspectorType type, FrameInstrumentationSupport frameInstrumentationSupport)
     : InspectorBaseAgent<InspectorTimelineAgent>("Timeline", instrumentingAgents, state)
     , m_frontend(0)
@@ -445 +451 @@
     , m_maxCallStackDepth(5)
     , m_inspectorType(type)
+    , m_frameInstrumentationSupport(frameInstrumentationSupport)
 {
 }

trunk/Source/WebCore/inspector/InspectorTimelineAgent.h

@@ -45 +45 @@
 namespace WebCore {
 class Event;
+class InspectorClient;
 class InspectorFrontend;
 class InspectorState;
@@ -58 +59 @@
 public:
     enum InspectorType { PageInspector, WorkerInspector };
-    static PassOwnPtr<InspectorTimelineAgent> create(InstrumentingAgents* instrumentingAgents, InspectorState* state, InspectorType type)
+    enum FrameInstrumentationSupport { FrameInstrumentationNotSupported, FrameInstrumentationSupported };
+
+    static PassOwnPtr<InspectorTimelineAgent> create(InstrumentingAgents* instrumentingAgents, InspectorState* state, InspectorType type, FrameInstrumentationSupport frameInstrumentationSupport)
     {
-        return adoptPtr(new InspectorTimelineAgent(instrumentingAgents, state, type));
+        return adoptPtr(new InspectorTimelineAgent(instrumentingAgents, state, type, frameInstrumentationSupport));
     }
 
@@ -72 +75 @@
     virtual void stop(ErrorString*);
     virtual void setIncludeMemoryDetails(ErrorString*, bool);
+    virtual void supportsFrameInstrumentation(ErrorString*, bool*);
 
     int id() const { return m_id; }
@@ -146 +150 @@
     };
         
-    InspectorTimelineAgent(InstrumentingAgents*, InspectorState*, InspectorType);
+    InspectorTimelineAgent(InstrumentingAgents*, InspectorState*, InspectorType, FrameInstrumentationSupport);
 
     void pushCurrentRecord(PassRefPtr<InspectorObject>, const String& type, bool captureCallStack);
@@ -184 +188 @@
     int m_maxCallStackDepth;
     InspectorType m_inspectorType;
+    FrameInstrumentationSupport m_frameInstrumentationSupport;
 };
 

trunk/Source/WebCore/inspector/WorkerInspectorController.cpp

@@ -103 +103 @@
     m_profilerAgent = InspectorProfilerAgent::create(m_instrumentingAgents.get(), m_consoleAgent.get(), workerContext, m_state.get(), m_injectedScriptManager.get());
 #endif
-    m_timelineAgent = InspectorTimelineAgent::create(m_instrumentingAgents.get(), m_state.get(), InspectorTimelineAgent::WorkerInspector);
+    m_timelineAgent = InspectorTimelineAgent::create(m_instrumentingAgents.get(), m_state.get(), InspectorTimelineAgent::WorkerInspector, InspectorTimelineAgent::FrameInstrumentationNotSupported);
 
     m_injectedScriptManager->injectedScriptHost()->init(0

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

@@ -54 +54 @@
     nativeInstrumentationEnabled: false,
     heapProfilerPresent: false,
-    canOverrideDeviceMetrics: false
+    canOverrideDeviceMetrics: false,
+    timelineSupportsFrameInstrumentation: false,
 }
 
@@ -180 +181 @@
     
     // Add currently running experiments here.
-    this.timelineVerticalOverview = this._createExperiment("timelineStartAtZero", "Enable vertical overview mode in the Timeline panel");
     this.showShadowDOM = this._createExperiment("showShadowDOM", "Show shadow DOM");
     this.snippetsSupport = this._createExperiment("snippetsSupport", "Snippets support");

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

@@ -61 +61 @@
     eventsOverviewItem.onselect = this._showEvents.bind(this);
 
-    if (WebInspector.experimentsSettings.timelineVerticalOverview.isEnabled()) {
+    if (Capabilities.timelineSupportsFrameInstrumentation) {
         var framesOverviewItem = new WebInspector.SidebarTreeElement("timeline-overview-sidebar-frames", WebInspector.UIString("Frames"));
         topPaneSidebarTree.appendChild(framesOverviewItem);

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

@@ -394 +394 @@
     ProfilerAgent.isSampling(WebInspector._initializeCapability.bind(WebInspector, "samplingCPUProfiler", null));
     ProfilerAgent.hasHeapProfiler(WebInspector._initializeCapability.bind(WebInspector, "heapProfilerPresent", null));
+    TimelineAgent.supportsFrameInstrumentation(WebInspector._initializeCapability.bind(WebInspector, "timelineSupportsFrameInstrumentation", null));
     PageAgent.canOverrideDeviceMetrics(WebInspector._initializeCapability.bind(WebInspector, "canOverrideDeviceMetrics", WebInspector._doLoadedDoneWithCapabilities.bind(WebInspector)));
 }

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-05-06  Andrey Kosyakov  <caseq@chromium.org>
+
+        Web Inspector: take timeline frame mode out of experimental
+        https://bugs.webkit.org/show_bug.cgi?id=85707
+
+        Reviewed by Pavel Feldman.
+
+        - exposed supportFrameInstrumentation method to InspectorClient. Client must return true iff the platform will call
+          InspectorInstrumentation::instrumentBeginFrame() upon beginning of frame rendering;
+
+        * src/InspectorClientImpl.cpp:
+        (WebKit::InspectorClientImpl::supportsFrameInstrumentation):
+        (WebKit):
+        * src/InspectorClientImpl.h:
+        (InspectorClientImpl):
+
 2012-05-04  Kent Tamura  <tkent@chromium.org>
 

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

@@ -146 +146 @@
 }
 
+bool InspectorClientImpl::supportsFrameInstrumentation()
+{
+    return true;
+}
+
 WebDevToolsAgentImpl* InspectorClientImpl::devToolsAgent()
 {

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

@@ -69 +69 @@
     virtual void autoZoomPageToFitWidth();
 
+    virtual bool supportsFrameInstrumentation();
+
 private:
     WebDevToolsAgentImpl* devToolsAgent();