summaryrefslogtreecommitdiffstats
path: root/cc/output/delegating_renderer.h
diff options
context:
space:
mode:
authoraelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 12:19:29 +0000
committeraelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 12:19:29 +0000
commit36e5ff130092eb95bf734c39d15e1ae48fad1581 (patch)
tree63c4142ae12770156248e2c1c61fd4c93dd089a4 /cc/output/delegating_renderer.h
parentf74356578beb2e385a1bd5a1a26677ce058bc4bf (diff)
downloadchromium_src-36e5ff130092eb95bf734c39d15e1ae48fad1581.zip
chromium_src-36e5ff130092eb95bf734c39d15e1ae48fad1581.tar.gz
chromium_src-36e5ff130092eb95bf734c39d15e1ae48fad1581.tar.bz2
Unified OutputSurface::SwapBuffers.
This patch introduces a hard contract that CC will always call OutputSurface::SwapBuffers(), and OutputSurface will always respond with OutputSurfaceClient::OnSwapBuffersComplete(), in all rendering modes. I deleted the methods SendFrameToParentCompositor, PostSubBuffer, and OnSendFrameToParentCompositorAck, subsuming them into SwapBuffers. I also deleted all the settings and capabilities specifying which variant needed to be called. This should be a no-op for all graphics modes except for Android WebView, where it has the benefits of ensuring OnSwapBuffersComplete is called and that CompositorFrameMetadata is available even though no parent compositor exists. NOTRY=true BUG=237006 Review URL: https://chromiumcodereview.appspot.com/16304003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/output/delegating_renderer.h')
-rw-r--r--cc/output/delegating_renderer.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/cc/output/delegating_renderer.h b/cc/output/delegating_renderer.h
index 20aa3f6..eb7e68f 100644
--- a/cc/output/delegating_renderer.h
+++ b/cc/output/delegating_renderer.h
@@ -32,12 +32,11 @@ class CC_EXPORT DelegatingRenderer : public Renderer {
virtual void Finish() OVERRIDE {}
- virtual void SwapBuffers(const ui::LatencyInfo& latency_info) OVERRIDE;
+ virtual void SwapBuffers() OVERRIDE;
+ virtual void ReceiveSwapBuffersAck(const CompositorFrameAck&) OVERRIDE;
virtual void GetFramebufferPixels(void* pixels, gfx::Rect rect) OVERRIDE;
- virtual void ReceiveCompositorFrameAck(const CompositorFrameAck&) OVERRIDE;
-
virtual bool IsContextLost() OVERRIDE;
virtual void SetVisible(bool visible) OVERRIDE;