Changeset 136171 in webkit

Timestamp:

Nov 29, 2012, 3:07:23 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

Source/WebCore: Web Inspector: Web Inspector: Make main-thread monitoring go through InspectorController.
​https://bugs.webkit.org/show_bug.cgi?id=103550

Patch by Eugene Klyuchnikov <​eustas@chromium.org> on 2012-11-29
Reviewed by Pavel Feldman.

InspectorInstrumentation was a wrong path.

• inspector/InspectorClient.h: Remove start/stop methods.
• inspector/InspectorController.cpp:

Dispatch main thread activity notifications.

• inspector/InspectorController.h: Ditto.
• inspector/InspectorInstrumentation.cpp: Remove dispatching.
• inspector/InspectorInstrumentation.h: Ditto.
• inspector/InspectorTimelineAgent.cpp:

Do not subscribe for notifications explicitly.

Source/WebKit/chromium: Web Inspector: Make main-thread monitoring go through InspectorController.
​https://bugs.webkit.org/show_bug.cgi?id=103550

Patch by Eugene Klyuchnikov <​eustas@chromium.org> on 2012-11-29
Reviewed by Pavel Feldman.

InspectorInstrumentation was a wrong path

• src/InspectorClientImpl.cpp: Remove TaskObserver implementation, and

listen/unlisten methods.

• src/InspectorClientImpl.h: Ditto.
• src/WebDevToolsAgentImpl.cpp:

(WebKit::WebDevToolsAgentImpl::attach):
Subscribe for main thread activity events.
(WebKit::WebDevToolsAgentImpl::detach):
Unsubscribe for main thread activity events.
(WebKit::WebDevToolsAgentImpl::willProcessTask): Implement TaskObserver
interface. Froward to InspectorController.
(WebKit::WebDevToolsAgentImpl::didProcessTask): Ditto.

• src/WebDevToolsAgentImpl.h: Implement TaskObserver interface.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/InspectorClient.h (modified) (1 diff)
• WebCore/inspector/InspectorController.cpp (modified) (1 diff)
• WebCore/inspector/InspectorController.h (modified) (1 diff)
• WebCore/inspector/InspectorInstrumentation.cpp (modified) (1 diff)
• WebCore/inspector/InspectorInstrumentation.h (modified) (3 diffs)
• WebCore/inspector/InspectorTimelineAgent.cpp (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/InspectorClientImpl.cpp (modified) (3 diffs)
• WebKit/chromium/src/InspectorClientImpl.h (modified) (4 diffs)
• WebKit/chromium/src/WebDevToolsAgentImpl.cpp (modified) (4 diffs)
• WebKit/chromium/src/WebDevToolsAgentImpl.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-29  Eugene Klyuchnikov  <eustas@chromium.org>
+
+        Web Inspector: Web Inspector: Make main-thread monitoring go through InspectorController.
+        https://bugs.webkit.org/show_bug.cgi?id=103550
+
+        Reviewed by Pavel Feldman.
+
+        InspectorInstrumentation was a wrong path.
+
+        * inspector/InspectorClient.h: Remove start/stop methods.
+        * inspector/InspectorController.cpp:
+        Dispatch main thread activity notifications. 
+        * inspector/InspectorController.h: Ditto.
+        * inspector/InspectorInstrumentation.cpp: Remove dispatching.
+        * inspector/InspectorInstrumentation.h: Ditto.
+        * inspector/InspectorTimelineAgent.cpp:
+        Do not subscribe for notifications explicitly.
+
 2012-11-29  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/inspector/InspectorClient.h

@@ -59 +59 @@
     virtual void clearBrowserCookies() { }
     virtual bool canMonitorMainThread() { return false; }
-    virtual void startMainThreadMonitoring() { }
-    virtual void stopMainThreadMonitoring() { }
 
     virtual bool canOverrideDeviceMetrics() { return false; }

trunk/Source/WebCore/inspector/InspectorController.cpp

@@ -400 +400 @@
 }
 
+void InspectorController::willProcessTask()
+{
+    if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
+        timelineAgent->willProcessTask();
+}
+
+void InspectorController::didProcessTask()
+{
+    if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
+        timelineAgent->didProcessTask();
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/inspector/InspectorController.h

@@ -120 +120 @@
     void reportMemoryUsage(MemoryObjectInfo*) const;
 
+    void willProcessTask();
+    void didProcessTask();
+
 private:
     InspectorController(Page*, InspectorClient*);

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -608 +608 @@
 }
 
-void InspectorInstrumentation::willProcessTaskImpl(InstrumentingAgents* instrumentingAgents)
-{
-    if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
-        timelineAgent->willProcessTask();
-}
-
-void InspectorInstrumentation::didProcessTaskImpl(InstrumentingAgents* instrumentingAgents)
-{
-    if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
-        timelineAgent->didProcessTask();
-}
-
 void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents* instrumentingAgents, String* userAgent)
 {

trunk/Source/WebCore/inspector/InspectorInstrumentation.h

@@ -155 +155 @@
     static InspectorInstrumentationCookie willProcessRule(Document*, const StyleRule*);
     static void didProcessRule(const InspectorInstrumentationCookie&);
-    static void willProcessTask(Page*);
-    static void didProcessTask(Page*);
 
     static void applyUserAgentOverride(Frame*, String*);
@@ -349 +347 @@
     static InspectorInstrumentationCookie willProcessRuleImpl(InstrumentingAgents*, const StyleRule*);
     static void didProcessRuleImpl(const InspectorInstrumentationCookie&);
-    static void willProcessTaskImpl(InstrumentingAgents*);
-    static void didProcessTaskImpl(InstrumentingAgents*);
 
     static void applyUserAgentOverrideImpl(InstrumentingAgents*, String*);
@@ -1033 +1029 @@
 }
 
-inline void InspectorInstrumentation::willProcessTask(Page* page)
-{
-#if ENABLE(INSPECTOR)
-    FAST_RETURN_IF_NO_FRONTENDS(void());
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
-        willProcessTaskImpl(instrumentingAgents);
-#endif
-}
-
-inline void InspectorInstrumentation::didProcessTask(Page* page)
-{
-#if ENABLE(INSPECTOR)
-    FAST_RETURN_IF_NO_FRONTENDS(void());
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
-        didProcessTaskImpl(instrumentingAgents);
-#endif
-}
-
 inline void InspectorInstrumentation::applyUserAgentOverride(Frame* frame, String* userAgent)
 {

trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp

@@ -169 +169 @@
     m_timestampOffset = currentTime() - monotonicallyIncreasingTime();
 
-    if (m_client)
-        m_client->startMainThreadMonitoring();
-
     m_instrumentingAgents->setInspectorTimelineAgent(this);
     ScriptGCEvent::addEventListener(this);
@@ -181 +178 @@
     if (!m_state->getBoolean(TimelineAgentState::timelineAgentEnabled))
         return;
-
-    if (m_client)
-        m_client->stopMainThreadMonitoring();
 
     m_instrumentingAgents->setInspectorTimelineAgent(0);

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-11-29  Eugene Klyuchnikov  <eustas@chromium.org>
+
+        Web Inspector: Make main-thread monitoring go through InspectorController.
+        https://bugs.webkit.org/show_bug.cgi?id=103550
+
+        Reviewed by Pavel Feldman.
+
+        InspectorInstrumentation was a wrong path
+
+        * src/InspectorClientImpl.cpp: Remove TaskObserver implementation, and
+        listen/unlisten methods.
+        * src/InspectorClientImpl.h: Ditto.
+        * src/WebDevToolsAgentImpl.cpp:
+        (WebKit::WebDevToolsAgentImpl::attach):
+        Subscribe for main thread activity events.
+        (WebKit::WebDevToolsAgentImpl::detach):
+        Unsubscribe for main thread activity events.
+        (WebKit::WebDevToolsAgentImpl::willProcessTask): Implement TaskObserver
+        interface. Froward to InspectorController.
+        (WebKit::WebDevToolsAgentImpl::didProcessTask): Ditto.
+        * src/WebDevToolsAgentImpl.h: Implement TaskObserver interface.
+
 2012-11-29  Stephen Chenney  <schenney@chromium.org>
 

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

@@ -40 +40 @@
 #include "WebViewClient.h"
 #include "WebViewImpl.h"
-#include <public/Platform.h>
 #include <public/WebRect.h>
 #include <public/WebURL.h>
@@ -137 +136 @@
 }
 
-void InspectorClientImpl::startMainThreadMonitoring()
-{
-    WebKit::Platform::current()->currentThread()->addTaskObserver(this);
-}
-
-void InspectorClientImpl::stopMainThreadMonitoring()
-{
-    WebKit::Platform::current()->currentThread()->removeTaskObserver(this);
-}
-
 bool InspectorClientImpl::canOverrideDeviceMetrics()
 {
@@ -201 +190 @@
 }
 
-void InspectorClientImpl::willProcessTask()
-{
-    InspectorInstrumentation::willProcessTask(m_inspectedWebView->page());
-}
-
-void InspectorClientImpl::didProcessTask()
-{
-    InspectorInstrumentation::didProcessTask(m_inspectedWebView->page());
-}
-
 WebDevToolsAgentImpl* InspectorClientImpl::devToolsAgent()
 {

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

@@ -35 +35 @@
 #include "InspectorController.h"
 #include "InspectorFrontendChannel.h"
-#include <public/WebThread.h>
 #include <wtf/OwnPtr.h>
 
@@ -45 +44 @@
 
 class InspectorClientImpl : public WebCore::InspectorClient,
-                            public WebCore::InspectorFrontendChannel,
-                            public WebThread::TaskObserver {
+                            public WebCore::InspectorFrontendChannel {
 public:
     InspectorClientImpl(WebViewImpl*);
@@ -71 +69 @@
 
     virtual bool canMonitorMainThread();
-    virtual void startMainThreadMonitoring();
-    virtual void stopMainThreadMonitoring();
 
     virtual bool canOverrideDeviceMetrics();
@@ -90 +86 @@
 
 private:
-    // WebThread::TaskObserver
-    virtual void willProcessTask();
-    virtual void didProcessTask();
-
     WebDevToolsAgentImpl* devToolsAgent();
 

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

@@ -57 +57 @@
 #include "WebViewClient.h"
 #include "WebViewImpl.h"
+#include <public/Platform.h>
 #include <public/WebRect.h>
 #include <public/WebString.h>
@@ -383 +384 @@
     inspectorController()->connectFrontend(this);
     inspectorController()->webViewResized(m_webViewImpl->size());
+    WebKit::Platform::current()->currentThread()->addTaskObserver(this);
     m_attached = true;
 }
@@ -398 +400 @@
 void WebDevToolsAgentImpl::detach()
 {
+    WebKit::Platform::current()->currentThread()->removeTaskObserver(this);
+
     // Prevent controller from sending messages to the frontend.
     InspectorController* ic = inspectorController();
@@ -655 +659 @@
     InspectorController* ic = inspectorController();
     ic->evaluateForTestInFrontend(callId, script);
+}
+
+void WebDevToolsAgentImpl::willProcessTask()
+{
+    if (InspectorController* ic = inspectorController())
+        ic->willProcessTask();
+}
+
+void WebDevToolsAgentImpl::didProcessTask()
+{
+    if (InspectorController* ic = inspectorController())
+        ic->didProcessTask();
 }
 

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

@@ -38 +38 @@
 #include "WebPageOverlay.h"
 #include <public/WebSize.h>
+#include <public/WebThread.h>
 #include <wtf/Forward.h>
 #include <wtf/OwnPtr.h>
@@ -67 +68 @@
                              public WebCore::InspectorClient,
                              public WebCore::InspectorFrontendChannel,
-                             public WebPageOverlay {
+                             public WebPageOverlay,
+                             private WebThread::TaskObserver {
 public:
     WebDevToolsAgentImpl(WebViewImpl* webViewImpl, WebDevToolsAgentClient* client);
@@ -115 +117 @@
 
 private:
+    // WebThread::TaskObserver
+    virtual void willProcessTask();
+    virtual void didProcessTask();
+
     WebCore::InspectorController* inspectorController();
     WebCore::Frame* mainFrame();