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

Side by Side Diff: cc/layers/content_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/input/top_controls_manager_unittest.cc ('k') | cc/layers/contents_scaling_layer.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 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 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_CONTENT_LAYER_H_ 5 #ifndef CC_LAYERS_CONTENT_LAYER_H_
6 #define CC_LAYERS_CONTENT_LAYER_H_ 6 #define CC_LAYERS_CONTENT_LAYER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "cc/base/cc_export.h" 9 #include "cc/base/cc_export.h"
10 #include "cc/layers/tiled_layer.h" 10 #include "cc/layers/tiled_layer.h"
11 #include "cc/resources/layer_painter.h" 11 #include "cc/resources/layer_painter.h"
12 12
13 class SkCanvas; 13 class SkCanvas;
14 14
15 namespace cc { 15 namespace cc {
16 16
17 class ContentLayerClient; 17 class ContentLayerClient;
18 class ContentLayerUpdater; 18 class ContentLayerUpdater;
19 19
20 class CC_EXPORT ContentLayerPainter : public LayerPainter { 20 class CC_EXPORT ContentLayerPainter : public LayerPainter {
21 public: 21 public:
22 static scoped_ptr<ContentLayerPainter> Create(ContentLayerClient* client); 22 static scoped_ptr<ContentLayerPainter> Create(ContentLayerClient* client);
23 23
24 virtual void Paint(SkCanvas* canvas, const gfx::Rect& content_rect) OVERRIDE; 24 virtual void Paint(SkCanvas* canvas, const gfx::Rect& content_rect) override;
25 25
26 private: 26 private:
27 explicit ContentLayerPainter(ContentLayerClient* client); 27 explicit ContentLayerPainter(ContentLayerClient* client);
28 28
29 ContentLayerClient* client_; 29 ContentLayerClient* client_;
30 30
31 DISALLOW_COPY_AND_ASSIGN(ContentLayerPainter); 31 DISALLOW_COPY_AND_ASSIGN(ContentLayerPainter);
32 }; 32 };
33 33
34 // A layer that renders its contents into an SkCanvas. 34 // A layer that renders its contents into an SkCanvas.
35 class CC_EXPORT ContentLayer : public TiledLayer { 35 class CC_EXPORT ContentLayer : public TiledLayer {
36 public: 36 public:
37 static scoped_refptr<ContentLayer> Create(ContentLayerClient* client); 37 static scoped_refptr<ContentLayer> Create(ContentLayerClient* client);
38 38
39 void ClearClient(); 39 void ClearClient();
40 40
41 virtual void SetLayerTreeHost(LayerTreeHost* layer_tree_host) OVERRIDE; 41 virtual void SetLayerTreeHost(LayerTreeHost* layer_tree_host) override;
42 virtual void SetTexturePriorities(const PriorityCalculator& priority_calc) 42 virtual void SetTexturePriorities(const PriorityCalculator& priority_calc)
43 OVERRIDE; 43 override;
44 virtual bool Update(ResourceUpdateQueue* queue, 44 virtual bool Update(ResourceUpdateQueue* queue,
45 const OcclusionTracker<Layer>* occlusion) OVERRIDE; 45 const OcclusionTracker<Layer>* occlusion) override;
46 virtual bool NeedMoreUpdates() OVERRIDE; 46 virtual bool NeedMoreUpdates() override;
47 47
48 virtual void SetContentsOpaque(bool contents_opaque) OVERRIDE; 48 virtual void SetContentsOpaque(bool contents_opaque) override;
49 49
50 virtual bool SupportsLCDText() const OVERRIDE; 50 virtual bool SupportsLCDText() const override;
51 51
52 virtual skia::RefPtr<SkPicture> GetPicture() const OVERRIDE; 52 virtual skia::RefPtr<SkPicture> GetPicture() const override;
53 53
54 virtual void OnOutputSurfaceCreated() OVERRIDE; 54 virtual void OnOutputSurfaceCreated() override;
55 55
56 protected: 56 protected:
57 explicit ContentLayer(ContentLayerClient* client); 57 explicit ContentLayer(ContentLayerClient* client);
58 virtual ~ContentLayer(); 58 virtual ~ContentLayer();
59 59
60 virtual bool HasDrawableContent() const OVERRIDE; 60 virtual bool HasDrawableContent() const override;
61 61
62 // TiledLayer implementation. 62 // TiledLayer implementation.
63 virtual LayerUpdater* Updater() const OVERRIDE; 63 virtual LayerUpdater* Updater() const override;
64 64
65 private: 65 private:
66 // TiledLayer implementation. 66 // TiledLayer implementation.
67 virtual void CreateUpdaterIfNeeded() OVERRIDE; 67 virtual void CreateUpdaterIfNeeded() override;
68 68
69 void UpdateCanUseLCDText(); 69 void UpdateCanUseLCDText();
70 70
71 ContentLayerClient* client_; 71 ContentLayerClient* client_;
72 scoped_refptr<ContentLayerUpdater> updater_; 72 scoped_refptr<ContentLayerUpdater> updater_;
73 bool can_use_lcd_text_last_frame_; 73 bool can_use_lcd_text_last_frame_;
74 74
75 DISALLOW_COPY_AND_ASSIGN(ContentLayer); 75 DISALLOW_COPY_AND_ASSIGN(ContentLayer);
76 }; 76 };
77 77
78 } // namespace cc 78 } // namespace cc
79 #endif // CC_LAYERS_CONTENT_LAYER_H_ 79 #endif // CC_LAYERS_CONTENT_LAYER_H_
OLDNEW
« no previous file with comments | « cc/input/top_controls_manager_unittest.cc ('k') | cc/layers/contents_scaling_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698