summaryrefslogtreecommitdiffstats
path: root/cc/output/output_surface_unittest.cc
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/output_surface_unittest.cc
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/output_surface_unittest.cc')
-rw-r--r--cc/output/output_surface_unittest.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/cc/output/output_surface_unittest.cc b/cc/output/output_surface_unittest.cc
index 72bf0a4..ebc018f 100644
--- a/cc/output/output_surface_unittest.cc
+++ b/cc/output/output_surface_unittest.cc
@@ -50,9 +50,7 @@ class FakeOutputSurfaceClient : public OutputSurfaceClient {
virtual void OnVSyncParametersChanged(base::TimeTicks timebase,
base::TimeDelta interval) OVERRIDE {}
virtual void BeginFrame(base::TimeTicks frame_time) OVERRIDE {}
- virtual void OnSendFrameToParentCompositorAck(const CompositorFrameAck& ack)
- OVERRIDE {}
- virtual void OnSwapBuffersComplete() OVERRIDE {}
+ virtual void OnSwapBuffersComplete(const CompositorFrameAck* ack) OVERRIDE {}
virtual void DidLoseOutputSurface() OVERRIDE {
did_lose_output_surface_called_ = true;
}