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

Side by Side Diff: cc/layers/layer_impl.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/layers/layer.h ('k') | cc/layers/layer_impl_unittest.cc » ('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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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_LAYERS_LAYER_IMPL_H_ 5 #ifndef CC_LAYERS_LAYER_IMPL_H_
6 #define CC_LAYERS_LAYER_IMPL_H_ 6 #define CC_LAYERS_LAYER_IMPL_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 static scoped_ptr<LayerImpl> Create(LayerTreeImpl* tree_impl, int id) { 92 static scoped_ptr<LayerImpl> Create(LayerTreeImpl* tree_impl, int id) {
93 return make_scoped_ptr(new LayerImpl(tree_impl, id)); 93 return make_scoped_ptr(new LayerImpl(tree_impl, id));
94 } 94 }
95 95
96 virtual ~LayerImpl(); 96 virtual ~LayerImpl();
97 97
98 int id() const { return layer_id_; } 98 int id() const { return layer_id_; }
99 99
100 // LayerAnimationValueProvider implementation. 100 // LayerAnimationValueProvider implementation.
101 virtual gfx::ScrollOffset ScrollOffsetForAnimation() const OVERRIDE; 101 virtual gfx::ScrollOffset ScrollOffsetForAnimation() const override;
102 102
103 // LayerAnimationValueObserver implementation. 103 // LayerAnimationValueObserver implementation.
104 virtual void OnFilterAnimated(const FilterOperations& filters) OVERRIDE; 104 virtual void OnFilterAnimated(const FilterOperations& filters) override;
105 virtual void OnOpacityAnimated(float opacity) OVERRIDE; 105 virtual void OnOpacityAnimated(float opacity) override;
106 virtual void OnTransformAnimated(const gfx::Transform& transform) OVERRIDE; 106 virtual void OnTransformAnimated(const gfx::Transform& transform) override;
107 virtual void OnScrollOffsetAnimated( 107 virtual void OnScrollOffsetAnimated(
108 const gfx::ScrollOffset& scroll_offset) OVERRIDE; 108 const gfx::ScrollOffset& scroll_offset) override;
109 virtual void OnAnimationWaitingForDeletion() OVERRIDE; 109 virtual void OnAnimationWaitingForDeletion() override;
110 virtual bool IsActive() const OVERRIDE; 110 virtual bool IsActive() const override;
111 111
112 // AnimationDelegate implementation. 112 // AnimationDelegate implementation.
113 virtual void NotifyAnimationStarted( 113 virtual void NotifyAnimationStarted(
114 base::TimeTicks monotonic_time, 114 base::TimeTicks monotonic_time,
115 Animation::TargetProperty target_property) OVERRIDE{}; 115 Animation::TargetProperty target_property) override{};
116 virtual void NotifyAnimationFinished( 116 virtual void NotifyAnimationFinished(
117 base::TimeTicks monotonic_time, 117 base::TimeTicks monotonic_time,
118 Animation::TargetProperty target_property) OVERRIDE; 118 Animation::TargetProperty target_property) override;
119 119
120 // Tree structure. 120 // Tree structure.
121 LayerImpl* parent() { return parent_; } 121 LayerImpl* parent() { return parent_; }
122 const LayerImpl* parent() const { return parent_; } 122 const LayerImpl* parent() const { return parent_; }
123 const OwnedLayerImplList& children() const { return children_; } 123 const OwnedLayerImplList& children() const { return children_; }
124 OwnedLayerImplList& children() { return children_; } 124 OwnedLayerImplList& children() { return children_; }
125 LayerImpl* child_at(size_t index) const { return children_[index]; } 125 LayerImpl* child_at(size_t index) const { return children_[index]; }
126 void AddChild(scoped_ptr<LayerImpl> child); 126 void AddChild(scoped_ptr<LayerImpl> child);
127 scoped_ptr<LayerImpl> RemoveChild(LayerImpl* child); 127 scoped_ptr<LayerImpl> RemoveChild(LayerImpl* child);
128 void SetParent(LayerImpl* parent); 128 void SetParent(LayerImpl* parent);
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 DrawProperties<LayerImpl> draw_properties_; 706 DrawProperties<LayerImpl> draw_properties_;
707 707
708 scoped_refptr<base::debug::ConvertableToTraceFormat> debug_info_; 708 scoped_refptr<base::debug::ConvertableToTraceFormat> debug_info_;
709 709
710 DISALLOW_COPY_AND_ASSIGN(LayerImpl); 710 DISALLOW_COPY_AND_ASSIGN(LayerImpl);
711 }; 711 };
712 712
713 } // namespace cc 713 } // namespace cc
714 714
715 #endif // CC_LAYERS_LAYER_IMPL_H_ 715 #endif // CC_LAYERS_LAYER_IMPL_H_
OLDNEW
« no previous file with comments | « cc/layers/layer.h ('k') | cc/layers/layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698