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

Side by Side Diff: ui/compositor/compositor.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 UI_COMPOSITOR_COMPOSITOR_H_ 5 #ifndef UI_COMPOSITOR_COMPOSITOR_H_
6 #define UI_COMPOSITOR_COMPOSITOR_H_ 6 #define UI_COMPOSITOR_COMPOSITOR_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 // Signals swap has been posted. 216 // Signals swap has been posted.
217 void OnSwapBuffersPosted(); 217 void OnSwapBuffersPosted();
218 218
219 // Signals swap has completed. 219 // Signals swap has completed.
220 void OnSwapBuffersComplete(); 220 void OnSwapBuffersComplete();
221 221
222 // Signals swap has aborted (e.g. lost context). 222 // Signals swap has aborted (e.g. lost context).
223 void OnSwapBuffersAborted(); 223 void OnSwapBuffersAborted();
224 224
225 // LayerTreeHostClient implementation. 225 // LayerTreeHostClient implementation.
226 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {} 226 virtual void WillBeginMainFrame(int frame_id) override {}
227 virtual void DidBeginMainFrame() OVERRIDE {} 227 virtual void DidBeginMainFrame() override {}
228 virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE; 228 virtual void BeginMainFrame(const cc::BeginFrameArgs& args) override;
229 virtual void Layout() OVERRIDE; 229 virtual void Layout() override;
230 virtual void ApplyViewportDeltas( 230 virtual void ApplyViewportDeltas(
231 const gfx::Vector2d& inner_delta, 231 const gfx::Vector2d& inner_delta,
232 const gfx::Vector2d& outer_delta, 232 const gfx::Vector2d& outer_delta,
233 float page_scale, 233 float page_scale,
234 float top_controls_delta) OVERRIDE {} 234 float top_controls_delta) override {}
235 virtual void ApplyViewportDeltas( 235 virtual void ApplyViewportDeltas(
236 const gfx::Vector2d& scroll_delta, 236 const gfx::Vector2d& scroll_delta,
237 float page_scale, 237 float page_scale,
238 float top_controls_delta) OVERRIDE {} 238 float top_controls_delta) override {}
239 virtual void RequestNewOutputSurface(bool fallback) OVERRIDE; 239 virtual void RequestNewOutputSurface(bool fallback) override;
240 virtual void DidInitializeOutputSurface() OVERRIDE {} 240 virtual void DidInitializeOutputSurface() override {}
241 virtual void WillCommit() OVERRIDE {} 241 virtual void WillCommit() override {}
242 virtual void DidCommit() OVERRIDE; 242 virtual void DidCommit() override;
243 virtual void DidCommitAndDrawFrame() OVERRIDE; 243 virtual void DidCommitAndDrawFrame() override;
244 virtual void DidCompleteSwapBuffers() OVERRIDE; 244 virtual void DidCompleteSwapBuffers() override;
245 245
246 // cc::LayerTreeHostSingleThreadClient implementation. 246 // cc::LayerTreeHostSingleThreadClient implementation.
247 virtual void DidPostSwapBuffers() OVERRIDE; 247 virtual void DidPostSwapBuffers() override;
248 virtual void DidAbortSwapBuffers() OVERRIDE; 248 virtual void DidAbortSwapBuffers() override;
249 249
250 bool IsLocked() { return compositor_lock_ != NULL; } 250 bool IsLocked() { return compositor_lock_ != NULL; }
251 251
252 const cc::LayerTreeDebugState& GetLayerTreeDebugState() const; 252 const cc::LayerTreeDebugState& GetLayerTreeDebugState() const;
253 void SetLayerTreeDebugState(const cc::LayerTreeDebugState& debug_state); 253 void SetLayerTreeDebugState(const cc::LayerTreeDebugState& debug_state);
254 254
255 LayerAnimatorCollection* layer_animator_collection() { 255 LayerAnimatorCollection* layer_animator_collection() {
256 return &layer_animator_collection_; 256 return &layer_animator_collection_;
257 } 257 }
258 258
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 CompositorLock* compositor_lock_; 297 CompositorLock* compositor_lock_;
298 298
299 LayerAnimatorCollection layer_animator_collection_; 299 LayerAnimatorCollection layer_animator_collection_;
300 300
301 DISALLOW_COPY_AND_ASSIGN(Compositor); 301 DISALLOW_COPY_AND_ASSIGN(Compositor);
302 }; 302 };
303 303
304 } // namespace ui 304 } // namespace ui
305 305
306 #endif // UI_COMPOSITOR_COMPOSITOR_H_ 306 #endif // UI_COMPOSITOR_COMPOSITOR_H_
OLDNEW
« no previous file with comments | « ui/compositor/closure_animation_observer.h ('k') | ui/compositor/float_animation_curve_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698