diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-16 22:06:54 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-16 22:06:54 +0000 |
| commit | 4aea68c80606e2c23fbe8f606dc1b547761602ed (patch) | |
| tree | 6d6915d4565d7c420ae678bed264424629833381 /cc/test/fake_output_surface.h | |
| parent | 0d62d534e71351d5807ff598456d3ab85c6fbb7a (diff) | |
| download | chromium_src-4aea68c80606e2c23fbe8f606dc1b547761602ed.zip chromium_src-4aea68c80606e2c23fbe8f606dc1b547761602ed.tar.gz chromium_src-4aea68c80606e2c23fbe8f606dc1b547761602ed.tar.bz2 | |
Revert 194394 "Move swapcomplete callback into OutputSurface"
It broke android in a weird manner, like it shows in your trybots.
> Move swapcomplete callback into OutputSurface
>
> Things like swap are concepts of an OutputSurface, not a context. Moving the
> callbacks to OutputSurface will also reduce cc's knowledge of the context
> guts and let us swap out the GL interface.
>
> Review URL: https://codereview.chromium.org/12545018
TBR=jamesr@chromium.org
Review URL: https://codereview.chromium.org/14308015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194459 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/fake_output_surface.h')
| -rw-r--r-- | cc/test/fake_output_surface.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h index 8af8709..e23f8cb 100644 --- a/cc/test/fake_output_surface.h +++ b/cc/test/fake_output_surface.h @@ -56,6 +56,7 @@ class FakeOutputSurface : public OutputSurface { new FakeOutputSurface(software_device.Pass(), true)); } + virtual bool BindToClient(OutputSurfaceClient* client) OVERRIDE; virtual void SendFrameToParentCompositor(CompositorFrame* frame) OVERRIDE; CompositorFrame& last_sent_frame() { return last_sent_frame_; } |