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

Side by Side Diff: cc/layers/tiled_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/texture_layer_unittest.cc ('k') | cc/layers/tiled_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 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_TILED_LAYER_H_ 5 #ifndef CC_LAYERS_TILED_LAYER_H_
6 #define CC_LAYERS_TILED_LAYER_H_ 6 #define CC_LAYERS_TILED_LAYER_H_
7 7
8 #include "cc/base/cc_export.h" 8 #include "cc/base/cc_export.h"
9 #include "cc/layers/contents_scaling_layer.h" 9 #include "cc/layers/contents_scaling_layer.h"
10 #include "cc/resources/layer_tiling_data.h" 10 #include "cc/resources/layer_tiling_data.h"
11 #include "cc/resources/resource_format.h" 11 #include "cc/resources/resource_format.h"
12 12
13 namespace cc { 13 namespace cc {
14 class LayerUpdater; 14 class LayerUpdater;
15 class PrioritizedResourceManager; 15 class PrioritizedResourceManager;
16 class PrioritizedResource; 16 class PrioritizedResource;
17 class UpdatableTile; 17 class UpdatableTile;
18 18
19 class CC_EXPORT TiledLayer : public ContentsScalingLayer { 19 class CC_EXPORT TiledLayer : public ContentsScalingLayer {
20 public: 20 public:
21 enum TilingOption { 21 enum TilingOption {
22 ALWAYS_TILE, 22 ALWAYS_TILE,
23 NEVER_TILE, 23 NEVER_TILE,
24 AUTO_TILE, 24 AUTO_TILE,
25 }; 25 };
26 26
27 // Layer implementation. 27 // Layer implementation.
28 virtual void SetIsMask(bool is_mask) OVERRIDE; 28 virtual void SetIsMask(bool is_mask) override;
29 virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE; 29 virtual void PushPropertiesTo(LayerImpl* layer) override;
30 virtual void ReduceMemoryUsage() OVERRIDE; 30 virtual void ReduceMemoryUsage() override;
31 virtual void SetNeedsDisplayRect(const gfx::RectF& dirty_rect) OVERRIDE; 31 virtual void SetNeedsDisplayRect(const gfx::RectF& dirty_rect) override;
32 virtual void SetLayerTreeHost(LayerTreeHost* layer_tree_host) OVERRIDE; 32 virtual void SetLayerTreeHost(LayerTreeHost* layer_tree_host) override;
33 virtual void SetTexturePriorities(const PriorityCalculator& priority_calc) 33 virtual void SetTexturePriorities(const PriorityCalculator& priority_calc)
34 OVERRIDE; 34 override;
35 virtual SimpleEnclosedRegion VisibleContentOpaqueRegion() const OVERRIDE; 35 virtual SimpleEnclosedRegion VisibleContentOpaqueRegion() const override;
36 virtual bool Update(ResourceUpdateQueue* queue, 36 virtual bool Update(ResourceUpdateQueue* queue,
37 const OcclusionTracker<Layer>* occlusion) OVERRIDE; 37 const OcclusionTracker<Layer>* occlusion) override;
38 virtual void OnOutputSurfaceCreated() OVERRIDE; 38 virtual void OnOutputSurfaceCreated() override;
39 39
40 protected: 40 protected:
41 TiledLayer(); 41 TiledLayer();
42 virtual ~TiledLayer(); 42 virtual ~TiledLayer();
43 43
44 void UpdateTileSizeAndTilingOption(); 44 void UpdateTileSizeAndTilingOption();
45 void UpdateBounds(); 45 void UpdateBounds();
46 46
47 // Exposed to subclasses for testing. 47 // Exposed to subclasses for testing.
48 void SetTileSize(const gfx::Size& size); 48 void SetTileSize(const gfx::Size& size);
(...skipping 11 matching lines...) Expand all
60 60
61 // Reset state on tiles that will be used for updating the layer. 61 // Reset state on tiles that will be used for updating the layer.
62 void ResetUpdateState(); 62 void ResetUpdateState();
63 63
64 // After preparing an update, returns true if more painting is needed. 64 // After preparing an update, returns true if more painting is needed.
65 bool NeedsIdlePaint(); 65 bool NeedsIdlePaint();
66 gfx::Rect IdlePaintRect(); 66 gfx::Rect IdlePaintRect();
67 67
68 bool SkipsDraw() const { return skips_draw_; } 68 bool SkipsDraw() const { return skips_draw_; }
69 69
70 virtual bool HasDrawableContent() const OVERRIDE; 70 virtual bool HasDrawableContent() const override;
71 71
72 // Virtual for testing 72 // Virtual for testing
73 virtual PrioritizedResourceManager* ResourceManager(); 73 virtual PrioritizedResourceManager* ResourceManager();
74 const LayerTilingData* TilerForTesting() const { return tiler_.get(); } 74 const LayerTilingData* TilerForTesting() const { return tiler_.get(); }
75 const PrioritizedResource* ResourceAtForTesting(int i, int j) const; 75 const PrioritizedResource* ResourceAtForTesting(int i, int j) const;
76 76
77 private: 77 private:
78 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) 78 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
79 OVERRIDE; 79 override;
80 80
81 void CreateTilerIfNeeded(); 81 void CreateTilerIfNeeded();
82 void set_tiling_option(TilingOption tiling_option) { 82 void set_tiling_option(TilingOption tiling_option) {
83 tiling_option_ = tiling_option; 83 tiling_option_ = tiling_option;
84 } 84 }
85 85
86 bool TileOnlyNeedsPartialUpdate(UpdatableTile* tile); 86 bool TileOnlyNeedsPartialUpdate(UpdatableTile* tile);
87 bool TileNeedsBufferedUpdate(UpdatableTile* tile); 87 bool TileNeedsBufferedUpdate(UpdatableTile* tile);
88 88
89 void MarkOcclusionsAndRequestTextures( 89 void MarkOcclusionsAndRequestTextures(
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 139
140 TilingOption tiling_option_; 140 TilingOption tiling_option_;
141 scoped_ptr<LayerTilingData> tiler_; 141 scoped_ptr<LayerTilingData> tiler_;
142 142
143 DISALLOW_COPY_AND_ASSIGN(TiledLayer); 143 DISALLOW_COPY_AND_ASSIGN(TiledLayer);
144 }; 144 };
145 145
146 } // namespace cc 146 } // namespace cc
147 147
148 #endif // CC_LAYERS_TILED_LAYER_H_ 148 #endif // CC_LAYERS_TILED_LAYER_H_
OLDNEW
« no previous file with comments | « cc/layers/texture_layer_unittest.cc ('k') | cc/layers/tiled_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698