From 36e5ff130092eb95bf734c39d15e1ae48fad1581 Mon Sep 17 00:00:00 2001 From: "aelias@chromium.org" Date: Tue, 11 Jun 2013 12:19:29 +0000 Subject: 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 --- cc/output/delegating_renderer.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'cc/output/delegating_renderer.h') 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; -- cgit v1.1