| Index: 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 b944d09b9b9332e32daa3add7498c6359d48c512..d64e063ff720fcfdc65f4fe58c4de54fb060edc6 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_impl_frame_count_(0),
|
| + : begin_frame_count_(0),
|
| deferred_initialize_result_(true),
|
| deferred_initialize_called_(false),
|
| did_lose_output_surface_called_(false),
|
| @@ -23,7 +23,7 @@ class FakeOutputSurfaceClient : public OutputSurfaceClient {
|
| scoped_refptr<ContextProvider> offscreen_context_provider) OVERRIDE;
|
| virtual void ReleaseGL() OVERRIDE {}
|
| virtual void SetNeedsRedrawRect(const gfx::Rect& damage_rect) OVERRIDE {}
|
| - virtual void BeginImplFrame(const BeginFrameArgs& args) OVERRIDE;
|
| + virtual void BeginFrame(const BeginFrameArgs& args) OVERRIDE;
|
| virtual void DidSwapBuffers() OVERRIDE {}
|
| virtual void OnSwapBuffersComplete() OVERRIDE {}
|
| virtual void ReclaimResources(const CompositorFrameAck* ack) OVERRIDE {}
|
| @@ -36,9 +36,7 @@ class FakeOutputSurfaceClient : public OutputSurfaceClient {
|
| virtual void SetMemoryPolicy(const ManagedMemoryPolicy& policy) OVERRIDE;
|
| virtual void SetTreeActivationCallback(const base::Closure&) OVERRIDE {}
|
|
|
| - int begin_impl_frame_count() {
|
| - return begin_impl_frame_count_;
|
| - }
|
| + int begin_frame_count() { return begin_frame_count_; }
|
|
|
| void set_deferred_initialize_result(bool result) {
|
| deferred_initialize_result_ = result;
|
| @@ -55,7 +53,7 @@ class FakeOutputSurfaceClient : public OutputSurfaceClient {
|
| const ManagedMemoryPolicy& memory_policy() const { return memory_policy_; }
|
|
|
| private:
|
| - int begin_impl_frame_count_;
|
| + int begin_frame_count_;
|
| bool deferred_initialize_result_;
|
| bool deferred_initialize_called_;
|
| bool did_lose_output_surface_called_;
|
|
|