summaryrefslogtreecommitdiffstats
path: root/cc/test/fake_output_surface.h
diff options
context:
space:
mode:
authorbrianderson@chromium.org <brianderson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-12 13:21:48 +0000
committerbrianderson@chromium.org <brianderson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-12 13:21:48 +0000
commitbe62216f3ea56d5e9dc9bccf2c37e6e7937de290 (patch)
treef7da60411946679e8666addc93d4fe9a82216aa5 /cc/test/fake_output_surface.h
parentff0f4128d79ff878318a0c266947ee5ad14fc662 (diff)
downloadchromium_src-be62216f3ea56d5e9dc9bccf2c37e6e7937de290.zip
chromium_src-be62216f3ea56d5e9dc9bccf2c37e6e7937de290.tar.gz
chromium_src-be62216f3ea56d5e9dc9bccf2c37e6e7937de290.tar.bz2
cc: Emulate BeginFrame in OutputSurfaces that don't support it natively
This will allow us to avoid having two different code paths in the Scheduler. It also allows us to more easily remove the VSyncTimeSource and FrameRateController from the Scheduler. This patch instantiates the FrameRateController inside of OutputSurface for now, but the FrameRateController could be removed in future patches. BUG=245920 BUG=243497 Review URL: https://chromiumcodereview.appspot.com/15836005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/fake_output_surface.h')
-rw-r--r--cc/test/fake_output_surface.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h
index d54ffd3..7bc1a4f 100644
--- a/cc/test/fake_output_surface.h
+++ b/cc/test/fake_output_surface.h
@@ -74,7 +74,6 @@ class FakeOutputSurface : public OutputSurface {
bool needs_begin_frame() const {
return needs_begin_frame_;
}
- void BeginFrame(base::TimeTicks frame_time);
void set_forced_draw_to_software_device(bool forced) {
forced_draw_to_software_device_ = forced;
@@ -95,10 +94,13 @@ class FakeOutputSurface : public OutputSurface {
scoped_ptr<SoftwareOutputDevice> software_device,
bool delegated_rendering);
+ void OnBeginFrame();
+
CompositorFrame last_sent_frame_;
size_t num_sent_frames_;
bool needs_begin_frame_;
bool forced_draw_to_software_device_;
+ base::WeakPtrFactory<FakeOutputSurface> fake_weak_ptr_factory_;
};
static inline scoped_ptr<cc::OutputSurface> CreateFakeOutputSurface() {