Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(168)

Side by Side Diff: cc/test/fake_output_surface.h

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/test/fake_layer_tree_host_impl_client.h ('k') | cc/test/fake_output_surface_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_TEST_FAKE_OUTPUT_SURFACE_H_ 5 #ifndef CC_TEST_FAKE_OUTPUT_SURFACE_H_
6 #define CC_TEST_FAKE_OUTPUT_SURFACE_H_ 6 #define CC_TEST_FAKE_OUTPUT_SURFACE_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 scoped_ptr<TestWebGraphicsContext3D> context) { 85 scoped_ptr<TestWebGraphicsContext3D> context) {
86 scoped_ptr<FakeOutputSurface> surface(new FakeOutputSurface( 86 scoped_ptr<FakeOutputSurface> surface(new FakeOutputSurface(
87 TestContextProvider::Create(context.Pass()), false)); 87 TestContextProvider::Create(context.Pass()), false));
88 surface->capabilities_.uses_default_gl_framebuffer = false; 88 surface->capabilities_.uses_default_gl_framebuffer = false;
89 return surface.Pass(); 89 return surface.Pass();
90 } 90 }
91 91
92 CompositorFrame& last_sent_frame() { return last_sent_frame_; } 92 CompositorFrame& last_sent_frame() { return last_sent_frame_; }
93 size_t num_sent_frames() { return num_sent_frames_; } 93 size_t num_sent_frames() { return num_sent_frames_; }
94 94
95 virtual void SwapBuffers(CompositorFrame* frame) OVERRIDE; 95 virtual void SwapBuffers(CompositorFrame* frame) override;
96 96
97 virtual void SetNeedsBeginFrame(bool enable) OVERRIDE; 97 virtual void SetNeedsBeginFrame(bool enable) override;
98 bool needs_begin_frame() const { return needs_begin_frame_; } 98 bool needs_begin_frame() const { return needs_begin_frame_; }
99 99
100 virtual bool BindToClient(OutputSurfaceClient* client) OVERRIDE; 100 virtual bool BindToClient(OutputSurfaceClient* client) override;
101 101
102 using OutputSurface::ReleaseGL; 102 using OutputSurface::ReleaseGL;
103 using OutputSurface::InitializeAndSetContext3d; 103 using OutputSurface::InitializeAndSetContext3d;
104 104
105 void SetTreeActivationCallback(const base::Closure& callback); 105 void SetTreeActivationCallback(const base::Closure& callback);
106 106
107 const TransferableResourceArray& resources_held_by_parent() { 107 const TransferableResourceArray& resources_held_by_parent() {
108 return resources_held_by_parent_; 108 return resources_held_by_parent_;
109 } 109 }
110 110
111 void ReturnResource(unsigned id, CompositorFrameAck* ack); 111 void ReturnResource(unsigned id, CompositorFrameAck* ack);
112 112
113 virtual bool HasExternalStencilTest() const OVERRIDE; 113 virtual bool HasExternalStencilTest() const override;
114 114
115 void set_has_external_stencil_test(bool has_test) { 115 void set_has_external_stencil_test(bool has_test) {
116 has_external_stencil_test_ = has_test; 116 has_external_stencil_test_ = has_test;
117 } 117 }
118 118
119 void SetMemoryPolicyToSetAtBind( 119 void SetMemoryPolicyToSetAtBind(
120 scoped_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind); 120 scoped_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind);
121 121
122 protected: 122 protected:
123 FakeOutputSurface( 123 FakeOutputSurface(
(...skipping 18 matching lines...) Expand all
142 bool has_external_stencil_test_; 142 bool has_external_stencil_test_;
143 TransferableResourceArray resources_held_by_parent_; 143 TransferableResourceArray resources_held_by_parent_;
144 scoped_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind_; 144 scoped_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind_;
145 145
146 base::WeakPtrFactory<FakeOutputSurface> fake_weak_ptr_factory_; 146 base::WeakPtrFactory<FakeOutputSurface> fake_weak_ptr_factory_;
147 }; 147 };
148 148
149 } // namespace cc 149 } // namespace cc
150 150
151 #endif // CC_TEST_FAKE_OUTPUT_SURFACE_H_ 151 #endif // CC_TEST_FAKE_OUTPUT_SURFACE_H_
OLDNEW
« no previous file with comments | « cc/test/fake_layer_tree_host_impl_client.h ('k') | cc/test/fake_output_surface_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698