diff options
author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 05:17:18 +0000 |
---|---|---|
committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 05:17:18 +0000 |
commit | 5f07afcd9dc529b87cfa860ba8cbb526af214dec (patch) | |
tree | 5ae9ed998300679338518998b64b8972ab951350 /cc/test/fake_output_surface.h | |
parent | d12ffd8adf17f6442ed60900d14eaa84d0b4f027 (diff) | |
download | chromium_src-5f07afcd9dc529b87cfa860ba8cbb526af214dec.zip chromium_src-5f07afcd9dc529b87cfa860ba8cbb526af214dec.tar.gz chromium_src-5f07afcd9dc529b87cfa860ba8cbb526af214dec.tar.bz2 |
Adds a new callback as this signal is required to pass up to the application
independent of whether the compositor is generating frames
BUG=232944
Review URL: https://chromiumcodereview.appspot.com/16958012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/fake_output_surface.h')
-rw-r--r-- | cc/test/fake_output_surface.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h index ad81d84..18759ec 100644 --- a/cc/test/fake_output_surface.h +++ b/cc/test/fake_output_surface.h @@ -5,6 +5,7 @@ #ifndef CC_TEST_FAKE_OUTPUT_SURFACE_H_ #define CC_TEST_FAKE_OUTPUT_SURFACE_H_ +#include "base/callback.h" #include "base/time/time.h" #include "cc/output/begin_frame_args.h" #include "cc/output/compositor_frame.h" @@ -78,11 +79,15 @@ class FakeOutputSurface : public OutputSurface { } virtual bool ForcedDrawToSoftwareDevice() const OVERRIDE; + virtual bool BindToClient(OutputSurfaceClient* client) OVERRIDE; + bool SetAndInitializeContext3D( scoped_ptr<WebKit::WebGraphicsContext3D> context3d); using OutputSurface::ReleaseGL; + void SetTreeActivationCallback(const base::Closure& callback); + protected: FakeOutputSurface( scoped_ptr<WebKit::WebGraphicsContext3D> context3d, @@ -99,6 +104,7 @@ class FakeOutputSurface : public OutputSurface { void OnBeginFrame(); + OutputSurfaceClient* client_; CompositorFrame last_sent_frame_; size_t num_sent_frames_; bool needs_begin_frame_; |