| Index: cc/test/fake_output_surface.h
|
| diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h
|
| index 965f54347af15803bc18aa24866b9c78ed86ba7d..e44153c75911b4e770a2a472c6ac9b031668f4be 100644
|
| --- a/cc/test/fake_output_surface.h
|
| +++ b/cc/test/fake_output_surface.h
|
| @@ -94,10 +94,8 @@ class FakeOutputSurface : public OutputSurface {
|
|
|
| virtual void SwapBuffers(CompositorFrame* frame) OVERRIDE;
|
|
|
| - virtual void SetNeedsBeginImplFrame(bool enable) OVERRIDE;
|
| - bool needs_begin_impl_frame() const {
|
| - return needs_begin_impl_frame_;
|
| - }
|
| + virtual void SetNeedsBeginFrame(bool enable) OVERRIDE;
|
| + bool needs_begin_frame() const { return needs_begin_frame_; }
|
|
|
| void set_forced_draw_to_software_device(bool forced) {
|
| forced_draw_to_software_device_ = forced;
|
| @@ -140,12 +138,12 @@ class FakeOutputSurface : public OutputSurface {
|
| scoped_ptr<SoftwareOutputDevice> software_device,
|
| bool delegated_rendering);
|
|
|
| - void OnBeginImplFrame();
|
| + void OnBeginFrame();
|
|
|
| OutputSurfaceClient* client_;
|
| CompositorFrame last_sent_frame_;
|
| size_t num_sent_frames_;
|
| - bool needs_begin_impl_frame_;
|
| + bool needs_begin_frame_;
|
| bool forced_draw_to_software_device_;
|
| bool has_external_stencil_test_;
|
| TransferableResourceArray resources_held_by_parent_;
|
|
|