Changeset 100199 in webkit

Timestamp:

Nov 14, 2011, 3:10:16 PM (15 years ago)

Author:

enne@google.com

Message:

[chromium] Pipe compositor commit/swap up to WebWidgetClient
​https://bugs.webkit.org/show_bug.cgi?id=72041

Reviewed by Darin Fisher.

Source/WebCore:

• platform/graphics/chromium/cc/CCLayerTreeHost.h:

(WebCore::CCLayerTreeHost::didCommitAndDrawFrame):
(WebCore::CCLayerTreeHost::didCompleteSwapBuffers):

• platform/graphics/chromium/cc/CCSingleThreadProxy.cpp:

(WebCore::CCSingleThreadProxy::doComposite):

• platform/graphics/chromium/cc/CCThreadProxy.cpp:

(WebCore::CCThreadProxy::onSwapBuffersCompleteOnImplThread):
(WebCore::CCThreadProxy::scheduledActionDrawAndSwap):
(WebCore::CCThreadProxy::didCommitAndDrawFrame):
(WebCore::CCThreadProxy::didCompleteSwapBuffers):

• platform/graphics/chromium/cc/CCThreadProxy.h:

Source/WebKit/chromium:

• public/WebWidgetClient.h:

(WebKit::WebWidgetClient::didCommitAndDrawCompositorFrame):
(WebKit::WebWidgetClient::didCompleteSwapBuffers):

• src/WebLayerTreeViewImpl.cpp:

(WebKit::WebLayerTreeViewImpl::didCommitAndDrawFrame):
(WebKit::WebLayerTreeViewImpl::didCompleteSwapBuffers):

• src/WebLayerTreeViewImpl.h:
• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::didCommitAndDrawFrame):
(WebKit::WebViewImpl::didCompleteSwapBuffers):

• src/WebViewImpl.h:
• tests/CCLayerTreeHostTest.cpp:

(WTF::MockLayerTreeHostClient::didCommitAndDrawFrame):
(WTF::MockLayerTreeHostClient::didCompleteSwapBuffers):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h (modified) (2 diffs)
• WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp (modified) (1 diff)
• WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp (modified) (2 diffs)
• WebCore/platform/graphics/chromium/cc/CCThreadProxy.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebWidgetClient.h (modified) (1 diff)
• WebKit/chromium/src/WebLayerTreeViewImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/WebLayerTreeViewImpl.h (modified) (1 diff)
• WebKit/chromium/src/WebViewImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/WebViewImpl.h (modified) (1 diff)
• WebKit/chromium/tests/CCLayerTreeHostTest.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-14  Adrienne Walker  <enne@google.com>
+
+        [chromium] Pipe compositor commit/swap up to WebWidgetClient
+        https://bugs.webkit.org/show_bug.cgi?id=72041
+
+        Reviewed by Darin Fisher.
+
+        * platform/graphics/chromium/cc/CCLayerTreeHost.h:
+        (WebCore::CCLayerTreeHost::didCommitAndDrawFrame):
+        (WebCore::CCLayerTreeHost::didCompleteSwapBuffers):
+        * platform/graphics/chromium/cc/CCSingleThreadProxy.cpp:
+        (WebCore::CCSingleThreadProxy::doComposite):
+        * platform/graphics/chromium/cc/CCThreadProxy.cpp:
+        (WebCore::CCThreadProxy::onSwapBuffersCompleteOnImplThread):
+        (WebCore::CCThreadProxy::scheduledActionDrawAndSwap):
+        (WebCore::CCThreadProxy::didCommitAndDrawFrame):
+        (WebCore::CCThreadProxy::didCompleteSwapBuffers):
+        * platform/graphics/chromium/cc/CCThreadProxy.h:
+
 2011-11-14  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h

@@ -58 +58 @@
     virtual PassRefPtr<GraphicsContext3D> createLayerTreeHostContext3D() = 0;
     virtual void didRecreateGraphicsContext(bool success) = 0;
-    virtual void didCommitAndDrawFrame(int frameNumber) = 0;
+    virtual void didCommitAndDrawFrame() = 0;
+    virtual void didCompleteSwapBuffers() = 0;
 
     // Used only in the single-threaded path.
@@ -116 +117 @@
     void didBecomeInvisibleOnImplThread(CCLayerTreeHostImpl*);
     void didRecreateGraphicsContext(bool success);
-    void didCommitAndDrawFrame(int frameNumber) { m_client->didCommitAndDrawFrame(frameNumber); }
+    void didCommitAndDrawFrame() { m_client->didCommitAndDrawFrame(); }
+    void didCompleteSwapBuffers() { m_client->didCompleteSwapBuffers(); }
     void deleteContentsTexturesOnImplThread(TextureAllocator*);
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp

@@ -304 +304 @@
     if (m_nextFrameIsNewlyCommittedFrame) {
         m_nextFrameIsNewlyCommittedFrame = false;
-        m_layerTreeHost->didCommitAndDrawFrame(m_layerTreeHostImpl->sourceFrameNumber());
+        m_layerTreeHost->didCommitAndDrawFrame();
     }
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp

@@ -230 +230 @@
     TRACE_EVENT("CCThreadProxy::onSwapBuffersCompleteOnImplThread", this, 0);
     m_schedulerOnImplThread->didSwapBuffersComplete();
+    m_mainThreadProxy->postTask(createMainThreadTask(this, &CCThreadProxy::didCompleteSwapBuffers));
 }
 
@@ -488 +489 @@
     if (m_nextFrameIsNewlyCommittedFrameOnImplThread) {
         m_nextFrameIsNewlyCommittedFrameOnImplThread = false;
-        m_mainThreadProxy->postTask(createMainThreadTask(this, &CCThreadProxy::didCommitAndDrawFrame, m_layerTreeHostImpl->sourceFrameNumber()));
-    }
-}
-
-void CCThreadProxy::didCommitAndDrawFrame(int frameNumber)
+        m_mainThreadProxy->postTask(createMainThreadTask(this, &CCThreadProxy::didCommitAndDrawFrame));
+    }
+}
+
+void CCThreadProxy::didCommitAndDrawFrame()
 {
     ASSERT(isMainThread());
     if (!m_layerTreeHost)
         return;
-    m_layerTreeHost->didCommitAndDrawFrame(frameNumber);
+    m_layerTreeHost->didCommitAndDrawFrame();
+}
+
+void CCThreadProxy::didCompleteSwapBuffers()
+{
+    ASSERT(isMainThread());
+    if (!m_layerTreeHost)
+        return;
+    m_layerTreeHost->didCompleteSwapBuffers();
 }
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h

@@ -83 +83 @@
     // Called on CCMainThread
     void beginFrameAndCommit(int sequenceNumber, double frameBeginTime, PassOwnPtr<CCScrollAndScaleSet>);
-    void didCommitAndDrawFrame(int frameNumber);
+    void didCommitAndDrawFrame();
+    void didCompleteSwapBuffers();
 
     // Called on CCThread

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-11-14  Adrienne Walker  <enne@google.com>
+
+        [chromium] Pipe compositor commit/swap up to WebWidgetClient
+        https://bugs.webkit.org/show_bug.cgi?id=72041
+
+        Reviewed by Darin Fisher.
+
+        * public/WebWidgetClient.h:
+        (WebKit::WebWidgetClient::didCommitAndDrawCompositorFrame):
+        (WebKit::WebWidgetClient::didCompleteSwapBuffers):
+        * src/WebLayerTreeViewImpl.cpp:
+        (WebKit::WebLayerTreeViewImpl::didCommitAndDrawFrame):
+        (WebKit::WebLayerTreeViewImpl::didCompleteSwapBuffers):
+        * src/WebLayerTreeViewImpl.h:
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::didCommitAndDrawFrame):
+        (WebKit::WebViewImpl::didCompleteSwapBuffers):
+        * src/WebViewImpl.h:
+        * tests/CCLayerTreeHostTest.cpp:
+        (WTF::MockLayerTreeHostClient::didCommitAndDrawFrame):
+        (WTF::MockLayerTreeHostClient::didCompleteSwapBuffers):
+
 2011-11-14  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebWidgetClient.h

@@ -61 +61 @@
     virtual void didDeactivateCompositor() { }
 
+    // Called for compositing mode when the draw commands for a WebKit-side
+    // frame have been issued.
+    virtual void didCommitAndDrawCompositorFrame() { }
+
+    // Called for compositing mode when swapbuffers has been posted in the GPU
+    // process.
+    virtual void didCompleteSwapBuffers() { }
+
     // Called when a call to WebWidget::composite is required
     virtual void scheduleComposite() { }

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

@@ -97 +97 @@
 }
 
-void WebLayerTreeViewImpl::didCommitAndDrawFrame(int frameNumber)
+void WebLayerTreeViewImpl::didCommitAndDrawFrame()
+{
+    // FIXME: route this up to the WebLayerTreeView client
+}
+
+void WebLayerTreeViewImpl::didCompleteSwapBuffers()
 {
     // FIXME: route this up to the WebLayerTreeView client

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

@@ -45 +45 @@
     virtual void applyScrollAndScale(const WebCore::IntSize& scrollDelta, float pageScale);
     virtual PassRefPtr<WebCore::GraphicsContext3D> createLayerTreeHostContext3D();
-    virtual void didCommitAndDrawFrame(int frameNumber);
     virtual void didRecreateGraphicsContext(bool success);
+    virtual void didCommitAndDrawFrame();
+    virtual void didCompleteSwapBuffers();
 
     // Only used in the single threaded path.

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

@@ -2804 +2804 @@
 }
 
-void WebViewImpl::didCommitAndDrawFrame(int frameNumber)
-{
-    // FIXME: route this up to RenderWidget's didFlushPaint.
+void WebViewImpl::didCommitAndDrawFrame()
+{
+    if (m_client)
+        m_client->didCommitAndDrawCompositorFrame();
+}
+
+void WebViewImpl::didCompleteSwapBuffers()
+{
+    if (m_client)
+        m_client->didCompleteSwapBuffers();
 }
 

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

@@ -225 +225 @@
     virtual void applyScrollAndScale(const WebCore::IntSize&, float);
     virtual PassRefPtr<WebCore::GraphicsContext3D> createLayerTreeHostContext3D();
-    virtual void didCommitAndDrawFrame(int frameNumber);
+    virtual void didCommitAndDrawFrame();
+    virtual void didCompleteSwapBuffers();
     virtual void didRecreateGraphicsContext(bool success);
     virtual void scheduleComposite();

trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp

@@ -166 +166 @@
     }
 
-    virtual void didCommitAndDrawFrame(int frameNumber)
+    virtual void didCommitAndDrawFrame()
+    {
+    }
+
+    virtual void didCompleteSwapBuffers()
     {
     }