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

Side by Side Diff: cc/layers/painted_scrollbar_layer.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/nine_patch_layer_impl.h ('k') | cc/layers/painted_scrollbar_layer_impl.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_PAINTED_SCROLLBAR_LAYER_H_ 5 #ifndef CC_LAYERS_PAINTED_SCROLLBAR_LAYER_H_
6 #define CC_LAYERS_PAINTED_SCROLLBAR_LAYER_H_ 6 #define CC_LAYERS_PAINTED_SCROLLBAR_LAYER_H_
7 7
8 #include "cc/base/cc_export.h" 8 #include "cc/base/cc_export.h"
9 #include "cc/input/scrollbar.h" 9 #include "cc/input/scrollbar.h"
10 #include "cc/layers/contents_scaling_layer.h" 10 #include "cc/layers/contents_scaling_layer.h"
11 #include "cc/layers/scrollbar_layer_interface.h" 11 #include "cc/layers/scrollbar_layer_interface.h"
12 #include "cc/layers/scrollbar_theme_painter.h" 12 #include "cc/layers/scrollbar_theme_painter.h"
13 #include "cc/resources/layer_updater.h" 13 #include "cc/resources/layer_updater.h"
14 #include "cc/resources/scoped_ui_resource.h" 14 #include "cc/resources/scoped_ui_resource.h"
15 15
16 namespace cc { 16 namespace cc {
17 class ScrollbarThemeComposite; 17 class ScrollbarThemeComposite;
18 18
19 class CC_EXPORT PaintedScrollbarLayer : public ScrollbarLayerInterface, 19 class CC_EXPORT PaintedScrollbarLayer : public ScrollbarLayerInterface,
20 public ContentsScalingLayer { 20 public ContentsScalingLayer {
21 public: 21 public:
22 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) 22 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
23 OVERRIDE; 23 override;
24 24
25 static scoped_refptr<PaintedScrollbarLayer> Create( 25 static scoped_refptr<PaintedScrollbarLayer> Create(
26 scoped_ptr<Scrollbar> scrollbar, 26 scoped_ptr<Scrollbar> scrollbar,
27 int scroll_layer_id); 27 int scroll_layer_id);
28 28
29 virtual bool OpacityCanAnimateOnImplThread() const OVERRIDE; 29 virtual bool OpacityCanAnimateOnImplThread() const override;
30 virtual ScrollbarLayerInterface* ToScrollbarLayer() OVERRIDE; 30 virtual ScrollbarLayerInterface* ToScrollbarLayer() override;
31 31
32 // ScrollbarLayerInterface 32 // ScrollbarLayerInterface
33 virtual int ScrollLayerId() const OVERRIDE; 33 virtual int ScrollLayerId() const override;
34 virtual void SetScrollLayer(int layer_id) OVERRIDE; 34 virtual void SetScrollLayer(int layer_id) override;
35 virtual void SetClipLayer(int layer_id) OVERRIDE; 35 virtual void SetClipLayer(int layer_id) override;
36 36
37 virtual ScrollbarOrientation orientation() const OVERRIDE; 37 virtual ScrollbarOrientation orientation() const override;
38 38
39 // Layer interface 39 // Layer interface
40 virtual bool Update(ResourceUpdateQueue* queue, 40 virtual bool Update(ResourceUpdateQueue* queue,
41 const OcclusionTracker<Layer>* occlusion) OVERRIDE; 41 const OcclusionTracker<Layer>* occlusion) override;
42 virtual void SetLayerTreeHost(LayerTreeHost* host) OVERRIDE; 42 virtual void SetLayerTreeHost(LayerTreeHost* host) override;
43 virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE; 43 virtual void PushPropertiesTo(LayerImpl* layer) override;
44 virtual void PushScrollClipPropertiesTo(LayerImpl* layer) OVERRIDE; 44 virtual void PushScrollClipPropertiesTo(LayerImpl* layer) override;
45 virtual void CalculateContentsScale(float ideal_contents_scale, 45 virtual void CalculateContentsScale(float ideal_contents_scale,
46 float* contents_scale_x, 46 float* contents_scale_x,
47 float* contents_scale_y, 47 float* contents_scale_y,
48 gfx::Size* content_bounds) OVERRIDE; 48 gfx::Size* content_bounds) override;
49 49
50 protected: 50 protected:
51 PaintedScrollbarLayer(scoped_ptr<Scrollbar> scrollbar, int scroll_layer_id); 51 PaintedScrollbarLayer(scoped_ptr<Scrollbar> scrollbar, int scroll_layer_id);
52 virtual ~PaintedScrollbarLayer(); 52 virtual ~PaintedScrollbarLayer();
53 53
54 // For unit tests 54 // For unit tests
55 UIResourceId track_resource_id() { 55 UIResourceId track_resource_id() {
56 return track_resource_.get() ? track_resource_->id() : 0; 56 return track_resource_.get() ? track_resource_->id() : 0;
57 } 57 }
58 UIResourceId thumb_resource_id() { 58 UIResourceId thumb_resource_id() {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 93
94 scoped_ptr<ScopedUIResource> track_resource_; 94 scoped_ptr<ScopedUIResource> track_resource_;
95 scoped_ptr<ScopedUIResource> thumb_resource_; 95 scoped_ptr<ScopedUIResource> thumb_resource_;
96 96
97 DISALLOW_COPY_AND_ASSIGN(PaintedScrollbarLayer); 97 DISALLOW_COPY_AND_ASSIGN(PaintedScrollbarLayer);
98 }; 98 };
99 99
100 } // namespace cc 100 } // namespace cc
101 101
102 #endif // CC_LAYERS_PAINTED_SCROLLBAR_LAYER_H_ 102 #endif // CC_LAYERS_PAINTED_SCROLLBAR_LAYER_H_
OLDNEW
« no previous file with comments | « cc/layers/nine_patch_layer_impl.h ('k') | cc/layers/painted_scrollbar_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698