From daea3d424f865ae7fc5720dea7b3c9565952a968 Mon Sep 17 00:00:00 2001 From: "dominikg@chromium.org" Date: Wed, 23 Oct 2013 17:04:50 +0000 Subject: Rename BeginFrame to BeginMainFrame and BeginImplFrame (part 3). Third patch in a series to rename BeginFrame. This patch focuses on cc::ThreadProxy, cc::LayerTreeHost, cc::LayerTreeHostImpl, cc::OutputSurface and it's related (sub)classes. In the scheduler, the term 'BeginFrame' is used for both the main thread and the impl thread. This can cause confusion if it's not obvious which one is being refered to. To clarify this, we rename BeginFrame to BeginMainFrame and BeginImplFrame, respectively. BUG=261765 Review URL: https://codereview.chromium.org/35023002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230453 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/test/fake_output_surface_client.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cc/test/fake_output_surface_client.h') diff --git a/cc/test/fake_output_surface_client.h b/cc/test/fake_output_surface_client.h index 08511ad..bf127d1 100644 --- a/cc/test/fake_output_surface_client.h +++ b/cc/test/fake_output_surface_client.h @@ -13,7 +13,7 @@ namespace cc { class FakeOutputSurfaceClient : public OutputSurfaceClient { public: FakeOutputSurfaceClient() - : begin_frame_count_(0), + : begin_impl_frame_count_(0), deferred_initialize_result_(true), deferred_initialize_called_(false), did_lose_output_surface_called_(false), @@ -24,7 +24,7 @@ class FakeOutputSurfaceClient : public OutputSurfaceClient { scoped_refptr offscreen_context_provider) OVERRIDE; virtual void ReleaseGL() OVERRIDE {} virtual void SetNeedsRedrawRect(gfx::Rect damage_rect) OVERRIDE {} - virtual void BeginFrame(const BeginFrameArgs& args) OVERRIDE; + virtual void BeginImplFrame(const BeginFrameArgs& args) OVERRIDE; virtual void OnSwapBuffersComplete() OVERRIDE {} virtual void ReclaimResources(const CompositorFrameAck* ack) OVERRIDE {} virtual void DidLoseOutputSurface() OVERRIDE; @@ -37,8 +37,8 @@ class FakeOutputSurfaceClient : public OutputSurfaceClient { virtual void SetDiscardBackBufferWhenNotVisible(bool discard) OVERRIDE; virtual void SetTreeActivationCallback(const base::Closure&) OVERRIDE {} - int begin_frame_count() { - return begin_frame_count_; + int begin_impl_frame_count() { + return begin_impl_frame_count_; } void set_deferred_initialize_result(bool result) { @@ -60,7 +60,7 @@ class FakeOutputSurfaceClient : public OutputSurfaceClient { } private: - int begin_frame_count_; + int begin_impl_frame_count_; bool deferred_initialize_result_; bool deferred_initialize_called_; bool did_lose_output_surface_called_; -- cgit v1.1