Title: [142879] trunk
Revision
142879
Author
[email protected]
Date
2013-02-14 08:39:23 -0800 (Thu, 14 Feb 2013)

Log Message

Web Inspector: expose did{Begin,Cancel}Frame() and {will,did}Composite() on WebDebToolsAgent
https://bugs.webkit.org/show_bug.cgi?id=109192

Reviewed by Pavel Feldman.

.:

* Source/autotools/symbols.filter:

Source/WebCore:

- remove frame and compositing instrumentation methods from InspectorInstrumentation;
- expose those methods on InspectorController instead.

* WebCore.exp.in:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::didBeginFrame):
(WebCore):
(WebCore::InspectorController::didCancelFrame):
(WebCore::InspectorController::willComposite):
(WebCore::InspectorController::didComposite):
* inspector/InspectorController.h:
(InspectorController):
* inspector/InspectorInstrumentation.cpp:
(WebCore):
* inspector/InspectorInstrumentation.h:
(InspectorInstrumentation):
* testing/Internals.cpp:
(WebCore::Internals::emitInspectorDidBeginFrame):
(WebCore::Internals::emitInspectorDidCancelFrame):

Source/WebKit/blackberry:

- invoke frame instrumentation methods on InspectorController, not on InspectorInstrumentation.

* Api/BackingStore.cpp:
(BlackBerry::WebKit::BackingStorePrivate::instrumentBeginFrame):
(BlackBerry::WebKit::BackingStorePrivate::instrumentCancelFrame):

Source/WebKit/chromium:

- expose frame and compositing insturmentation methods on WebDevToolsAgent;
- temporarily route them from WebViewImpl to WebDevToolsAgent;

* public/WebDevToolsAgent.h:
(WebDevToolsAgent):
* src/WebDevToolsAgentImpl.cpp:
(WebKit::WebDevToolsAgentImpl::didBeginFrame):
(WebKit):
(WebKit::WebDevToolsAgentImpl::didCancelFrame):
(WebKit::WebDevToolsAgentImpl::willComposite):
(WebKit::WebDevToolsAgentImpl::didComposite):
* src/WebDevToolsAgentImpl.h:
(WebDevToolsAgentImpl):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::instrumentBeginFrame):
(WebKit::WebViewImpl::instrumentCancelFrame):
(WebKit::WebViewImpl::didBeginFrame):
(WebKit::WebViewImpl::willCommit):

Source/WebKit/win:

* WebKit.vcproj/WebKitExports.def.in:

Modified Paths

Diff

Modified: trunk/ChangeLog (142878 => 142879)


--- trunk/ChangeLog	2013-02-14 16:15:21 UTC (rev 142878)
+++ trunk/ChangeLog	2013-02-14 16:39:23 UTC (rev 142879)
@@ -1,3 +1,12 @@
+2013-02-08  Andrey Kosyakov  <[email protected]>
+
+        Web Inspector: expose did{Begin,Cancel}Frame() and {will,did}Composite() on WebDebToolsAgent
+        https://bugs.webkit.org/show_bug.cgi?id=109192
+
+        Reviewed by Pavel Feldman.
+
+        * Source/autotools/symbols.filter:
+
 2013-02-13  Martin Robinson  <[email protected]>
 
         Try once again to fix the build after r142756

Modified: trunk/Source/WebCore/ChangeLog (142878 => 142879)


--- trunk/Source/WebCore/ChangeLog	2013-02-14 16:15:21 UTC (rev 142878)
+++ trunk/Source/WebCore/ChangeLog	2013-02-14 16:39:23 UTC (rev 142879)
@@ -1,3 +1,30 @@
+2013-02-08  Andrey Kosyakov  <[email protected]>
+
+        Web Inspector: expose did{Begin,Cancel}Frame() and {will,did}Composite() on WebDebToolsAgent
+        https://bugs.webkit.org/show_bug.cgi?id=109192
+
+        Reviewed by Pavel Feldman.
+
+        - remove frame and compositing instrumentation methods from InspectorInstrumentation;
+        - expose those methods on InspectorController instead.
+
+        * WebCore.exp.in:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::didBeginFrame):
+        (WebCore):
+        (WebCore::InspectorController::didCancelFrame):
+        (WebCore::InspectorController::willComposite):
+        (WebCore::InspectorController::didComposite):
+        * inspector/InspectorController.h:
+        (InspectorController):
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore):
+        * inspector/InspectorInstrumentation.h:
+        (InspectorInstrumentation):
+        * testing/Internals.cpp:
+        (WebCore::Internals::emitInspectorDidBeginFrame):
+        (WebCore::Internals::emitInspectorDidCancelFrame):
+
 2013-02-14  Vladislav Kaznacheev  <[email protected]>
 
         Web Inspector: Fixed a layout regression in CanvasProfileView.

Modified: trunk/Source/WebCore/WebCore.exp.in (142878 => 142879)


--- trunk/Source/WebCore/WebCore.exp.in	2013-02-14 16:15:21 UTC (rev 142878)
+++ trunk/Source/WebCore/WebCore.exp.in	2013-02-14 16:39:23 UTC (rev 142879)
@@ -2412,9 +2412,7 @@
 __ZN7WebCore19InspectorController5closeEv
 __ZN7WebCore21InspectorConsoleAgent28consoleMessageArgumentCountsEv
 __ZN7WebCore22instrumentationForPageEPNS_4PageE
-__ZN7WebCore24InspectorInstrumentation17didBeginFrameImplEPNS_19InstrumentingAgentsE
 __ZN7WebCore24InspectorInstrumentation17s_frontendCounterE
-__ZN7WebCore24InspectorInstrumentation18didCancelFrameImplEPNS_19InstrumentingAgentsE
 __ZN7WebCore24InspectorInstrumentation26instrumentingAgentsForPageEPNS_4PageE
 __ZN7WebCore28InspectorFrontendClientLocal11isUnderTestEv
 __ZN7WebCore28InspectorFrontendClientLocal11showConsoleEv
@@ -2444,6 +2442,8 @@
 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_9DOMWindowE
 __ZN7WebCore9DOMWindow4openERKN3WTF6StringERKNS1_12AtomicStringES4_PS0_S8_
 __ZN7WebCore9DOMWindow5closeEPNS_22ScriptExecutionContextE
+__ZN7WebCore19InspectorController13didBeginFrameEv
+__ZN7WebCore19InspectorController14didCancelFrameEv
 __ZNK7WebCore19InspectorController13drawHighlightERNS_15GraphicsContextE
 __ZNK7WebCore9DOMWindow8documentEv
 #endif

Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (142878 => 142879)


--- trunk/Source/WebCore/inspector/InspectorController.cpp	2013-02-14 16:15:21 UTC (rev 142878)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp	2013-02-14 16:39:23 UTC (rev 142879)
@@ -446,6 +446,30 @@
 #endif
 }
 
+void InspectorController::didBeginFrame()
+{
+    if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
+        timelineAgent->didBeginFrame();
+}
+
+void InspectorController::didCancelFrame()
+{
+    if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
+        timelineAgent->didCancelFrame();
+}
+
+void InspectorController::willComposite()
+{
+    if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
+        timelineAgent->willComposite();
+}
+
+void InspectorController::didComposite()
+{
+    if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
+        timelineAgent->didComposite();
+}
+
 HashMap<String, size_t> InspectorController::processMemoryDistribution() const
 {
     HashMap<String, size_t> memoryInfo;

Modified: trunk/Source/WebCore/inspector/InspectorController.h (142878 => 142879)


--- trunk/Source/WebCore/inspector/InspectorController.h	2013-02-14 16:15:21 UTC (rev 142878)
+++ trunk/Source/WebCore/inspector/InspectorController.h	2013-02-14 16:39:23 UTC (rev 142879)
@@ -125,6 +125,11 @@
     void willProcessTask();
     void didProcessTask();
 
+    void didBeginFrame();
+    void didCancelFrame();
+    void willComposite();
+    void didComposite();
+
     HashMap<String, size_t> processMemoryDistribution() const;
 
 private:

Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (142878 => 142879)


--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp	2013-02-14 16:15:21 UTC (rev 142878)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp	2013-02-14 16:39:23 UTC (rev 142879)
@@ -479,18 +479,6 @@
         timelineAgent->didFireTimer();
 }
 
-void InspectorInstrumentation::didBeginFrameImpl(InstrumentingAgents* instrumentingAgents)
-{
-    if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
-        timelineAgent->didBeginFrame();
-}
-
-void InspectorInstrumentation::didCancelFrameImpl(InstrumentingAgents* instrumentingAgents)
-{
-    if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
-        timelineAgent->didCancelFrame();
-}
-
 void InspectorInstrumentation::didInvalidateLayoutImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)
 {
     if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
@@ -563,18 +551,6 @@
         timelineAgent->didScroll();
 }
 
-void InspectorInstrumentation::willCompositeImpl(InstrumentingAgents* instrumentingAgents)
-{
-    if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
-        timelineAgent->willComposite();
-}
-
-void InspectorInstrumentation::didCompositeImpl(InstrumentingAgents* instrumentingAgents)
-{
-    if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
-        timelineAgent->didComposite();
-}
-
 InspectorInstrumentationCookie InspectorInstrumentation::willRecalculateStyleImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)
 {
     int timelineAgentId = 0;

Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (142878 => 142879)


--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h	2013-02-14 16:15:21 UTC (rev 142878)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h	2013-02-14 16:39:23 UTC (rev 142879)
@@ -156,8 +156,6 @@
     static void didCreateIsolatedContext(Frame*, ScriptState*, SecurityOrigin*);
     static InspectorInstrumentationCookie willFireTimer(ScriptExecutionContext*, int timerId);
     static void didFireTimer(const InspectorInstrumentationCookie&);
-    static void didBeginFrame(Page*);
-    static void didCancelFrame(Page*);
     static void didInvalidateLayout(Frame*);
     static InspectorInstrumentationCookie willLayout(Frame*);
     static void didLayout(const InspectorInstrumentationCookie&, RenderObject*);
@@ -361,8 +359,6 @@
     static void didCreateIsolatedContextImpl(InstrumentingAgents*, Frame*, ScriptState*, SecurityOrigin*);
     static InspectorInstrumentationCookie willFireTimerImpl(InstrumentingAgents*, int timerId, ScriptExecutionContext*);
     static void didFireTimerImpl(const InspectorInstrumentationCookie&);
-    static void didBeginFrameImpl(InstrumentingAgents*);
-    static void didCancelFrameImpl(InstrumentingAgents*);
     static void didInvalidateLayoutImpl(InstrumentingAgents*, Frame*);
     static InspectorInstrumentationCookie willLayoutImpl(InstrumentingAgents*, Frame*);
     static void didLayoutImpl(const InspectorInstrumentationCookie&, RenderObject*);
@@ -373,8 +369,6 @@
     static void didScrollLayerImpl(InstrumentingAgents*);
     static InspectorInstrumentationCookie willPaintImpl(InstrumentingAgents*, Frame*);
     static void didPaintImpl(const InspectorInstrumentationCookie&, GraphicsContext*, const LayoutRect&);
-    static void willCompositeImpl(InstrumentingAgents*);
-    static void didCompositeImpl(InstrumentingAgents*);
     static InspectorInstrumentationCookie willRecalculateStyleImpl(InstrumentingAgents*, Frame*);
     static void didRecalculateStyleImpl(const InspectorInstrumentationCookie&);
     static void didScheduleStyleRecalculationImpl(InstrumentingAgents*, Document*);
@@ -1017,28 +1011,6 @@
 #endif
 }
 
-inline void InspectorInstrumentation::didBeginFrame(Page* page)
-{
-#if ENABLE(INSPECTOR)
-    FAST_RETURN_IF_NO_FRONTENDS(void());
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
-        didBeginFrameImpl(instrumentingAgents);
-#else
-    UNUSED_PARAM(page);
-#endif
-}
-
-inline void InspectorInstrumentation::didCancelFrame(Page* page)
-{
-#if ENABLE(INSPECTOR)
-    FAST_RETURN_IF_NO_FRONTENDS(void());
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
-        didCancelFrameImpl(instrumentingAgents);
-#else
-    UNUSED_PARAM(page);
-#endif
-}
-
 inline void InspectorInstrumentation::didInvalidateLayout(Frame* frame)
 {
 #if ENABLE(INSPECTOR)
@@ -1156,28 +1128,6 @@
 #endif
 }
 
-inline void InspectorInstrumentation::willComposite(Page* page)
-{
-#if ENABLE(INSPECTOR)
-    FAST_RETURN_IF_NO_FRONTENDS(void());
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
-        willCompositeImpl(instrumentingAgents);
-#else
-    UNUSED_PARAM(page);
-#endif
-}
-
-inline void InspectorInstrumentation::didComposite(Page* page)
-{
-#if ENABLE(INSPECTOR)
-    FAST_RETURN_IF_NO_FRONTENDS(void());
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
-        didCompositeImpl(instrumentingAgents);
-#else
-    UNUSED_PARAM(page);
-#endif
-}
-
 inline InspectorInstrumentationCookie InspectorInstrumentation::willRecalculateStyle(Document* document)
 {
 #if ENABLE(INSPECTOR)

Modified: trunk/Source/WebCore/testing/Internals.cpp (142878 => 142879)


--- trunk/Source/WebCore/testing/Internals.cpp	2013-02-14 16:15:21 UTC (rev 142878)
+++ trunk/Source/WebCore/testing/Internals.cpp	2013-02-14 16:39:23 UTC (rev 142879)
@@ -1390,12 +1390,18 @@
 
 void Internals::emitInspectorDidBeginFrame()
 {
-    InspectorInstrumentation::didBeginFrame(contextDocument()->frame()->page());
+#if ENABLE(INSPECTOR)
+    InspectorController* inspectorController = contextDocument()->frame()->page()->inspectorController();
+    inspectorController->didBeginFrame();
+#endif
 }
 
 void Internals::emitInspectorDidCancelFrame()
 {
-    InspectorInstrumentation::didCancelFrame(contextDocument()->frame()->page());
+#if ENABLE(INSPECTOR)
+    InspectorController* inspectorController = contextDocument()->frame()->page()->inspectorController();
+    inspectorController->didCancelFrame();
+#endif
 }
 
 void Internals::setBatteryStatus(Document* document, const String& eventType, bool charging, double chargingTime, double dischargingTime, double level, ExceptionCode& ec)

Modified: trunk/Source/WebKit/blackberry/Api/BackingStore.cpp (142878 => 142879)


--- trunk/Source/WebKit/blackberry/Api/BackingStore.cpp	2013-02-14 16:15:21 UTC (rev 142878)
+++ trunk/Source/WebKit/blackberry/Api/BackingStore.cpp	2013-02-14 16:39:23 UTC (rev 142879)
@@ -217,12 +217,16 @@
 
 void BackingStorePrivate::instrumentBeginFrame()
 {
-    WebCore::InspectorInstrumentation::didBeginFrame(WebPagePrivate::core(m_webPage));
+#if ENABLE(INSPECTOR)
+    WebPagePrivate::core(m_webPage)->inspectorController()->instrumentBeginFrame();
+#endif
 }
 
 void BackingStorePrivate::instrumentCancelFrame()
 {
-    WebCore::InspectorInstrumentation::didCancelFrame(WebPagePrivate::core(m_webPage));
+#if ENABLE(INSPECTOR)
+    WebPagePrivate::core(m_webPage)->inspectorController()->instrumentCancelFrame();
+#endif
 }
 
 bool BackingStorePrivate::isOpenGLCompositing() const

Modified: trunk/Source/WebKit/blackberry/ChangeLog (142878 => 142879)


--- trunk/Source/WebKit/blackberry/ChangeLog	2013-02-14 16:15:21 UTC (rev 142878)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-02-14 16:39:23 UTC (rev 142879)
@@ -1,3 +1,16 @@
+2013-02-08  Andrey Kosyakov  <[email protected]>
+
+        Web Inspector: expose did{Begin,Cancel}Frame() and {will,did}Composite() on WebDebToolsAgent
+        https://bugs.webkit.org/show_bug.cgi?id=109192
+
+        Reviewed by Pavel Feldman.
+
+        - invoke frame instrumentation methods on InspectorController, not on InspectorInstrumentation.
+
+        * Api/BackingStore.cpp:
+        (BlackBerry::WebKit::BackingStorePrivate::instrumentBeginFrame):
+        (BlackBerry::WebKit::BackingStorePrivate::instrumentCancelFrame):
+
 2013-02-12  Jakob Petsovits  <[email protected]>
 
         [BlackBerry] Assume setScrollingOrZooming() to be called on the WebKit thread.

Modified: trunk/Source/WebKit/chromium/ChangeLog (142878 => 142879)


--- trunk/Source/WebKit/chromium/ChangeLog	2013-02-14 16:15:21 UTC (rev 142878)
+++ trunk/Source/WebKit/chromium/ChangeLog	2013-02-14 16:39:23 UTC (rev 142879)
@@ -1,3 +1,29 @@
+2013-02-08  Andrey Kosyakov  <[email protected]>
+
+        Web Inspector: expose did{Begin,Cancel}Frame() and {will,did}Composite() on WebDebToolsAgent
+        https://bugs.webkit.org/show_bug.cgi?id=109192
+
+        Reviewed by Pavel Feldman.
+
+        - expose frame and compositing insturmentation methods on WebDevToolsAgent;
+        - temporarily route them from WebViewImpl to WebDevToolsAgent;
+
+        * public/WebDevToolsAgent.h:
+        (WebDevToolsAgent):
+        * src/WebDevToolsAgentImpl.cpp:
+        (WebKit::WebDevToolsAgentImpl::didBeginFrame):
+        (WebKit):
+        (WebKit::WebDevToolsAgentImpl::didCancelFrame):
+        (WebKit::WebDevToolsAgentImpl::willComposite):
+        (WebKit::WebDevToolsAgentImpl::didComposite):
+        * src/WebDevToolsAgentImpl.h:
+        (WebDevToolsAgentImpl):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::instrumentBeginFrame):
+        (WebKit::WebViewImpl::instrumentCancelFrame):
+        (WebKit::WebViewImpl::didBeginFrame):
+        (WebKit::WebViewImpl::willCommit):
+
 2013-02-14  Mikhail Naganov  <[email protected]>
 
         [Chromium] Add a setting to control scaling content to fit viewport

Modified: trunk/Source/WebKit/chromium/public/WebDevToolsAgent.h (142878 => 142879)


--- trunk/Source/WebKit/chromium/public/WebDevToolsAgent.h	2013-02-14 16:15:21 UTC (rev 142878)
+++ trunk/Source/WebKit/chromium/public/WebDevToolsAgent.h	2013-02-14 16:39:23 UTC (rev 142879)
@@ -76,6 +76,11 @@
     virtual void inspectElementAt(const WebPoint&) = 0;
     virtual void setProcessId(long) = 0;
 
+    virtual void didBeginFrame() = 0;
+    virtual void didCancelFrame() = 0;
+    virtual void willComposite() = 0;
+    virtual void didComposite() = 0;
+    
     // Exposed for TestRunner.
     virtual void evaluateInWebInspector(long callId, const WebString& script) = 0;
 

Modified: trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp (142878 => 142879)


--- trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp	2013-02-14 16:15:21 UTC (rev 142878)
+++ trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp	2013-02-14 16:39:23 UTC (rev 142879)
@@ -426,6 +426,30 @@
     ClientMessageLoopAdapter::didNavigate();
 }
 
+void WebDevToolsAgentImpl::didBeginFrame()
+{
+    if (InspectorController* ic = inspectorController())
+        ic->didBeginFrame();
+}
+
+void WebDevToolsAgentImpl::didCancelFrame()
+{
+    if (InspectorController* ic = inspectorController())
+        ic->didCancelFrame();
+}
+
+void WebDevToolsAgentImpl::willComposite()
+{
+    if (InspectorController* ic = inspectorController())
+        ic->willComposite();
+}
+
+void WebDevToolsAgentImpl::didComposite()
+{
+    if (InspectorController* ic = inspectorController())
+        ic->didComposite();
+}
+
 void WebDevToolsAgentImpl::didCreateScriptContext(WebFrameImpl* webframe, int worldId)
 {
     // Skip non main world contexts.

Modified: trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h (142878 => 142879)


--- trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h	2013-02-14 16:15:21 UTC (rev 142878)
+++ trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h	2013-02-14 16:39:23 UTC (rev 142879)
@@ -85,6 +85,10 @@
     virtual void reattach(const WebString& savedState);
     virtual void detach();
     virtual void didNavigate();
+    virtual void didBeginFrame();
+    virtual void didCancelFrame();
+    virtual void willComposite();
+    virtual void didComposite();
     virtual void dispatchOnInspectorBackend(const WebString& message);
     virtual void inspectElementAt(const WebPoint& point);
     virtual void evaluateInWebInspector(long callId, const WebString& script);

Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (142878 => 142879)


--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp	2013-02-14 16:15:21 UTC (rev 142878)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp	2013-02-14 16:39:23 UTC (rev 142879)
@@ -1783,12 +1783,14 @@
 
 void WebViewImpl::instrumentBeginFrame()
 {
-    InspectorInstrumentation::didBeginFrame(m_page.get());
+    if (m_devToolsAgent)
+        m_devToolsAgent->didBeginFrame();
 }
 
 void WebViewImpl::instrumentCancelFrame()
 {
-    InspectorInstrumentation::didCancelFrame(m_page.get());
+    if (m_devToolsAgent)
+        m_devToolsAgent->didCancelFrame();
 }
 
 #if ENABLE(BATTERY_STATUS)
@@ -1822,7 +1824,8 @@
 
 void WebViewImpl::didBeginFrame()
 {
-    InspectorInstrumentation::didComposite(m_page.get());
+    if (m_devToolsAgent)
+        m_devToolsAgent->didComposite();
 
     if (m_continuousPaintingEnabled)
         ContinuousPainter::setNeedsDisplayRecursive(m_rootGraphicsLayer, m_pageOverlays.get());
@@ -4206,7 +4209,8 @@
 
 void WebViewImpl::willCommit()
 {
-    InspectorInstrumentation::willComposite(m_page.get());
+    if (m_devToolsAgent)
+        m_devToolsAgent->willComposite();
 }
 
 void WebViewImpl::didCommit()

Modified: trunk/Source/WebKit/win/ChangeLog (142878 => 142879)


--- trunk/Source/WebKit/win/ChangeLog	2013-02-14 16:15:21 UTC (rev 142878)
+++ trunk/Source/WebKit/win/ChangeLog	2013-02-14 16:39:23 UTC (rev 142879)
@@ -1,3 +1,12 @@
+2013-02-08  Andrey Kosyakov  <[email protected]>
+
+        Web Inspector: expose did{Begin,Cancel}Frame() and {will,did}Composite() on WebDebToolsAgent
+        https://bugs.webkit.org/show_bug.cgi?id=109192
+
+        Reviewed by Pavel Feldman.
+
+        * WebKit.vcproj/WebKitExports.def.in:
+
 2013-02-11  Ryosuke Niwa  <[email protected]>
 
         Disable delete button controller on non-Mac ports and delete EditorClient::shouldShowDeleteInterface

Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKitExports.def.in (142878 => 142879)


--- trunk/Source/WebKit/win/WebKit.vcproj/WebKitExports.def.in	2013-02-14 16:15:21 UTC (rev 142878)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKitExports.def.in	2013-02-14 16:39:23 UTC (rev 142879)
@@ -121,8 +121,8 @@
 #if ENABLE(INSPECTOR)
         ?consoleMessageArgumentCounts@InspectorConsoleAgent@WebCore@@QAE?AV?$Vector@I$0A@@WTF@@XZ
         ?counterValue@InspectorCounters@WebCore@@SAHW4CounterType@12@@Z
-        ?didBeginFrameImpl@InspectorInstrumentation@WebCore@@CAXPAVInstrumentingAgents@2@@Z
-        ?didCancelFrameImpl@InspectorInstrumentation@WebCore@@CAXPAVInstrumentingAgents@2@@Z
+        ?didBeginFrame@InspectorController@WebCore@@QAEXXZ
+        ?didCancelFrame@InspectorController@WebCore@@QAEXXZ
 #endif
         ?counterValueForElement@WebCore@@YA?AVString@WTF@@PAVElement@1@@Z
         ?createThread@WTF@@YAIP6APAXPAX@Z0PBD@Z

Modified: trunk/Source/autotools/symbols.filter (142878 => 142879)


--- trunk/Source/autotools/symbols.filter	2013-02-14 16:15:21 UTC (rev 142878)
+++ trunk/Source/autotools/symbols.filter	2013-02-14 16:39:23 UTC (rev 142879)
@@ -87,6 +87,8 @@
 _ZN7WebCore19InspectorController18disconnectFrontendEv;
 _ZN7WebCore19InspectorController26setInspectorFrontendClientEN3WTF10PassOwnPtrINS_23InspectorFrontendClientEEE;
 _ZN7WebCore19InspectorController39setResourcesDataSizeLimitsFromInternalsEii;
+_ZN7WebCore19InspectorController13didBeginFrameEv;
+_ZN7WebCore19InspectorController14didCancelFrameEv;
 _ZN7WebCore20CachedResourceLoader31garbageCollectDocumentResourcesEv;
 _ZN7WebCore20NodeRenderingContextC1EPNS_4NodeE;
 _ZN7WebCore20NodeRenderingContextD1Ev;
@@ -188,8 +190,6 @@
 _ZNK7WebCore19InspectorController12getHighlightEPNS_9HighlightE;
 _ZN7WebCore24InspectorInstrumentation26instrumentingAgentsForPageEPNS_4PageE;
 _ZN7WebCore24InspectorInstrumentation17s_frontendCounterE;
-_ZN7WebCore24InspectorInstrumentation17didBeginFrameImplEPNS_19InstrumentingAgentsE;
-_ZN7WebCore24InspectorInstrumentation18didCancelFrameImplEPNS_19InstrumentingAgentsE;
 _ZN7WebCore14ScrollableArea28setScrollOffsetFromInternalsERKNS_8IntPointE;
 _ZN7WebCore10ScrollView23setScrollbarsSuppressedEbb;
 _ZN7WebCore10ScrollView21setDelegatesScrollingEb;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to