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

Unified Diff: ui/compositor/layer.h

Issue 667923002: Standardize usage of virtual/override/final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/compositor/float_animation_curve_adapter.h ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer.h
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index ed75ff5d3c063de365e9198bf38e8aba3fe49f75..16a2578267c102bf7c0b32577161e18693a48626 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -71,7 +71,7 @@ class COMPOSITOR_EXPORT Layer
public:
Layer();
explicit Layer(LayerType type);
- virtual ~Layer();
+ ~Layer() override;
static bool UsingPictureLayer();
@@ -325,17 +325,17 @@ class COMPOSITOR_EXPORT Layer
void RequestCopyOfOutput(scoped_ptr<cc::CopyOutputRequest> request);
// ContentLayerClient
- virtual void PaintContents(
+ void PaintContents(
SkCanvas* canvas,
const gfx::Rect& clip,
ContentLayerClient::GraphicsContextStatus gc_status) override;
- virtual void DidChangeLayerCanUseLCDText() override {}
- virtual bool FillsBoundsCompletely() const override;
+ void DidChangeLayerCanUseLCDText() override {}
+ bool FillsBoundsCompletely() const override;
cc::Layer* cc_layer() { return cc_layer_; }
// TextureLayerClient
- virtual bool PrepareTextureMailbox(
+ bool PrepareTextureMailbox(
cc::TextureMailbox* mailbox,
scoped_ptr<cc::SingleReleaseCallback>* release_callback,
bool use_shared_memory) override;
@@ -348,11 +348,10 @@ class COMPOSITOR_EXPORT Layer
bool force_render_surface() const { return force_render_surface_; }
// LayerClient
- virtual scoped_refptr<base::debug::ConvertableToTraceFormat>
- TakeDebugInfo() override;
+ scoped_refptr<base::debug::ConvertableToTraceFormat> TakeDebugInfo() override;
// LayerAnimationEventObserver
- virtual void OnAnimationStarted(const cc::AnimationEvent& event) override;
+ void OnAnimationStarted(const cc::AnimationEvent& event) override;
// Whether this layer has animations waiting to get sent to its cc::Layer.
bool HasPendingThreadedAnimations() {
@@ -375,27 +374,25 @@ class COMPOSITOR_EXPORT Layer
bool ConvertPointFromAncestor(const Layer* ancestor, gfx::Point* point) const;
// Implementation of LayerAnimatorDelegate
- virtual void SetBoundsFromAnimation(const gfx::Rect& bounds) override;
- virtual void SetTransformFromAnimation(
- const gfx::Transform& transform) override;
- virtual void SetOpacityFromAnimation(float opacity) override;
- virtual void SetVisibilityFromAnimation(bool visibility) override;
- virtual void SetBrightnessFromAnimation(float brightness) override;
- virtual void SetGrayscaleFromAnimation(float grayscale) override;
- virtual void SetColorFromAnimation(SkColor color) override;
- virtual void ScheduleDrawForAnimation() override;
- virtual const gfx::Rect& GetBoundsForAnimation() const override;
- virtual gfx::Transform GetTransformForAnimation() const override;
- virtual float GetOpacityForAnimation() const override;
- virtual bool GetVisibilityForAnimation() const override;
- virtual float GetBrightnessForAnimation() const override;
- virtual float GetGrayscaleForAnimation() const override;
- virtual SkColor GetColorForAnimation() const override;
- virtual float GetDeviceScaleFactor() const override;
- virtual void AddThreadedAnimation(
- scoped_ptr<cc::Animation> animation) override;
- virtual void RemoveThreadedAnimation(int animation_id) override;
- virtual LayerAnimatorCollection* GetLayerAnimatorCollection() override;
+ void SetBoundsFromAnimation(const gfx::Rect& bounds) override;
+ void SetTransformFromAnimation(const gfx::Transform& transform) override;
+ void SetOpacityFromAnimation(float opacity) override;
+ void SetVisibilityFromAnimation(bool visibility) override;
+ void SetBrightnessFromAnimation(float brightness) override;
+ void SetGrayscaleFromAnimation(float grayscale) override;
+ void SetColorFromAnimation(SkColor color) override;
+ void ScheduleDrawForAnimation() override;
+ const gfx::Rect& GetBoundsForAnimation() const override;
+ gfx::Transform GetTransformForAnimation() const override;
+ float GetOpacityForAnimation() const override;
+ bool GetVisibilityForAnimation() const override;
+ float GetBrightnessForAnimation() const override;
+ float GetGrayscaleForAnimation() const override;
+ SkColor GetColorForAnimation() const override;
+ float GetDeviceScaleFactor() const override;
+ void AddThreadedAnimation(scoped_ptr<cc::Animation> animation) override;
+ void RemoveThreadedAnimation(int animation_id) override;
+ LayerAnimatorCollection* GetLayerAnimatorCollection() override;
// Creates a corresponding composited layer for |type_|.
void CreateCcLayer();
« no previous file with comments | « ui/compositor/float_animation_curve_adapter.h ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698