| Index: cc/layers/layer.h
|
| diff --git a/cc/layers/layer.h b/cc/layers/layer.h
|
| index 5af7195ae8e9a78ee307b45c0d788b53cd1150ea..c6279af1b19c8a996fa10df709bf18220b207b4b 100644
|
| --- a/cc/layers/layer.h
|
| +++ b/cc/layers/layer.h
|
| @@ -465,7 +465,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
| protected:
|
| friend class LayerImpl;
|
| friend class TreeSynchronizer;
|
| - virtual ~Layer();
|
| + ~Layer() override;
|
|
|
| Layer();
|
|
|
| @@ -552,16 +552,15 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
| void RemoveChildOrDependent(Layer* child);
|
|
|
| // LayerAnimationValueProvider implementation.
|
| - virtual gfx::ScrollOffset ScrollOffsetForAnimation() const override;
|
| + gfx::ScrollOffset ScrollOffsetForAnimation() const override;
|
|
|
| // LayerAnimationValueObserver implementation.
|
| - virtual void OnFilterAnimated(const FilterOperations& filters) override;
|
| - virtual void OnOpacityAnimated(float opacity) override;
|
| - virtual void OnTransformAnimated(const gfx::Transform& transform) override;
|
| - virtual void OnScrollOffsetAnimated(
|
| - const gfx::ScrollOffset& scroll_offset) override;
|
| - virtual void OnAnimationWaitingForDeletion() override;
|
| - virtual bool IsActive() const override;
|
| + void OnFilterAnimated(const FilterOperations& filters) override;
|
| + void OnOpacityAnimated(float opacity) override;
|
| + void OnTransformAnimated(const gfx::Transform& transform) override;
|
| + void OnScrollOffsetAnimated(const gfx::ScrollOffset& scroll_offset) override;
|
| + void OnAnimationWaitingForDeletion() override;
|
| + bool IsActive() const override;
|
|
|
| // If this layer has a scroll parent, it removes |this| from its list of
|
| // scroll children.
|
|
|