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

Side by Side Diff: cc/layers/heads_up_display_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/heads_up_display_layer.h ('k') | cc/layers/heads_up_display_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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_ 5 #ifndef CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_
6 #define CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_ 6 #define CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 17 matching lines...) Expand all
28 28
29 class CC_EXPORT HeadsUpDisplayLayerImpl : public LayerImpl { 29 class CC_EXPORT HeadsUpDisplayLayerImpl : public LayerImpl {
30 public: 30 public:
31 static scoped_ptr<HeadsUpDisplayLayerImpl> Create(LayerTreeImpl* tree_impl, 31 static scoped_ptr<HeadsUpDisplayLayerImpl> Create(LayerTreeImpl* tree_impl,
32 int id) { 32 int id) {
33 return make_scoped_ptr(new HeadsUpDisplayLayerImpl(tree_impl, id)); 33 return make_scoped_ptr(new HeadsUpDisplayLayerImpl(tree_impl, id));
34 } 34 }
35 virtual ~HeadsUpDisplayLayerImpl(); 35 virtual ~HeadsUpDisplayLayerImpl();
36 36
37 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) 37 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
38 OVERRIDE; 38 override;
39 39
40 virtual bool WillDraw(DrawMode draw_mode, 40 virtual bool WillDraw(DrawMode draw_mode,
41 ResourceProvider* resource_provider) OVERRIDE; 41 ResourceProvider* resource_provider) override;
42 virtual void AppendQuads(RenderPass* render_pass, 42 virtual void AppendQuads(RenderPass* render_pass,
43 const OcclusionTracker<LayerImpl>& occlusion_tracker, 43 const OcclusionTracker<LayerImpl>& occlusion_tracker,
44 AppendQuadsData* append_quads_data) OVERRIDE; 44 AppendQuadsData* append_quads_data) override;
45 void UpdateHudTexture(DrawMode draw_mode, 45 void UpdateHudTexture(DrawMode draw_mode,
46 ResourceProvider* resource_provider); 46 ResourceProvider* resource_provider);
47 47
48 virtual void ReleaseResources() OVERRIDE; 48 virtual void ReleaseResources() override;
49 49
50 bool IsAnimatingHUDContents() const { return fade_step_ > 0; } 50 bool IsAnimatingHUDContents() const { return fade_step_ > 0; }
51 51
52 private: 52 private:
53 class Graph { 53 class Graph {
54 public: 54 public:
55 Graph(double indicator_value, double start_upper_bound); 55 Graph(double indicator_value, double start_upper_bound);
56 56
57 // Eases the upper bound, which limits what is currently visible in the 57 // Eases the upper bound, which limits what is currently visible in the
58 // graph, so that the graph always scales to either it's max or 58 // graph, so that the graph always scales to either it's max or
59 // default_upper_bound. 59 // default_upper_bound.
60 double UpdateUpperBound(); 60 double UpdateUpperBound();
61 61
62 double value; 62 double value;
63 double min; 63 double min;
64 double max; 64 double max;
65 65
66 double current_upper_bound; 66 double current_upper_bound;
67 const double default_upper_bound; 67 const double default_upper_bound;
68 const double indicator; 68 const double indicator;
69 }; 69 };
70 70
71 HeadsUpDisplayLayerImpl(LayerTreeImpl* tree_impl, int id); 71 HeadsUpDisplayLayerImpl(LayerTreeImpl* tree_impl, int id);
72 72
73 virtual const char* LayerTypeAsString() const OVERRIDE; 73 virtual const char* LayerTypeAsString() const override;
74 74
75 virtual void AsValueInto(base::debug::TracedValue* dict) const OVERRIDE; 75 virtual void AsValueInto(base::debug::TracedValue* dict) const override;
76 76
77 void UpdateHudContents(); 77 void UpdateHudContents();
78 void DrawHudContents(SkCanvas* canvas); 78 void DrawHudContents(SkCanvas* canvas);
79 79
80 void DrawText(SkCanvas* canvas, 80 void DrawText(SkCanvas* canvas,
81 SkPaint* paint, 81 SkPaint* paint,
82 const std::string& text, 82 const std::string& text,
83 SkPaint::Align align, 83 SkPaint::Align align,
84 int size, 84 int size,
85 int x, 85 int x,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 std::vector<DebugRect> paint_rects_; 134 std::vector<DebugRect> paint_rects_;
135 135
136 base::TimeTicks time_of_last_graph_update_; 136 base::TimeTicks time_of_last_graph_update_;
137 137
138 DISALLOW_COPY_AND_ASSIGN(HeadsUpDisplayLayerImpl); 138 DISALLOW_COPY_AND_ASSIGN(HeadsUpDisplayLayerImpl);
139 }; 139 };
140 140
141 } // namespace cc 141 } // namespace cc
142 142
143 #endif // CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_ 143 #endif // CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_
OLDNEW
« no previous file with comments | « cc/layers/heads_up_display_layer.h ('k') | cc/layers/heads_up_display_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698