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

Side by Side Diff: cc/layers/picture_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/picture_image_layer_impl.h ('k') | cc/layers/picture_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 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_PICTURE_LAYER_H_ 5 #ifndef CC_LAYERS_PICTURE_LAYER_H_
6 #define CC_LAYERS_PICTURE_LAYER_H_ 6 #define CC_LAYERS_PICTURE_LAYER_H_
7 7
8 #include "cc/base/invalidation_region.h" 8 #include "cc/base/invalidation_region.h"
9 #include "cc/debug/devtools_instrumentation.h" 9 #include "cc/debug/devtools_instrumentation.h"
10 #include "cc/debug/micro_benchmark_controller.h" 10 #include "cc/debug/micro_benchmark_controller.h"
11 #include "cc/layers/layer.h" 11 #include "cc/layers/layer.h"
12 #include "cc/resources/picture_pile.h" 12 #include "cc/resources/picture_pile.h"
13 #include "cc/trees/occlusion_tracker.h" 13 #include "cc/trees/occlusion_tracker.h"
14 14
15 namespace cc { 15 namespace cc {
16 16
17 class ContentLayerClient; 17 class ContentLayerClient;
18 class ResourceUpdateQueue; 18 class ResourceUpdateQueue;
19 19
20 class CC_EXPORT PictureLayer : public Layer { 20 class CC_EXPORT PictureLayer : public Layer {
21 public: 21 public:
22 static scoped_refptr<PictureLayer> Create(ContentLayerClient* client); 22 static scoped_refptr<PictureLayer> Create(ContentLayerClient* client);
23 23
24 void ClearClient(); 24 void ClearClient();
25 25
26 // Layer interface. 26 // Layer interface.
27 virtual scoped_ptr<LayerImpl> CreateLayerImpl( 27 virtual scoped_ptr<LayerImpl> CreateLayerImpl(
28 LayerTreeImpl* tree_impl) OVERRIDE; 28 LayerTreeImpl* tree_impl) override;
29 virtual void SetLayerTreeHost(LayerTreeHost* host) OVERRIDE; 29 virtual void SetLayerTreeHost(LayerTreeHost* host) override;
30 virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE; 30 virtual void PushPropertiesTo(LayerImpl* layer) override;
31 virtual void SetNeedsDisplayRect(const gfx::RectF& layer_rect) OVERRIDE; 31 virtual void SetNeedsDisplayRect(const gfx::RectF& layer_rect) override;
32 virtual bool Update(ResourceUpdateQueue* queue, 32 virtual bool Update(ResourceUpdateQueue* queue,
33 const OcclusionTracker<Layer>* occlusion) OVERRIDE; 33 const OcclusionTracker<Layer>* occlusion) override;
34 virtual void SetIsMask(bool is_mask) OVERRIDE; 34 virtual void SetIsMask(bool is_mask) override;
35 virtual bool SupportsLCDText() const OVERRIDE; 35 virtual bool SupportsLCDText() const override;
36 virtual skia::RefPtr<SkPicture> GetPicture() const OVERRIDE; 36 virtual skia::RefPtr<SkPicture> GetPicture() const override;
37 virtual bool IsSuitableForGpuRasterization() const OVERRIDE; 37 virtual bool IsSuitableForGpuRasterization() const override;
38 38
39 virtual void RunMicroBenchmark(MicroBenchmark* benchmark) OVERRIDE; 39 virtual void RunMicroBenchmark(MicroBenchmark* benchmark) override;
40 40
41 ContentLayerClient* client() { return client_; } 41 ContentLayerClient* client() { return client_; }
42 42
43 Picture::RecordingMode RecordingMode() const; 43 Picture::RecordingMode RecordingMode() const;
44 44
45 PicturePile* GetPicturePileForTesting() const { return pile_.get(); } 45 PicturePile* GetPicturePileForTesting() const { return pile_.get(); }
46 46
47 protected: 47 protected:
48 explicit PictureLayer(ContentLayerClient* client); 48 explicit PictureLayer(ContentLayerClient* client);
49 virtual ~PictureLayer(); 49 virtual ~PictureLayer();
50 50
51 virtual bool HasDrawableContent() const OVERRIDE; 51 virtual bool HasDrawableContent() const override;
52 void UpdateCanUseLCDText(); 52 void UpdateCanUseLCDText();
53 53
54 private: 54 private:
55 ContentLayerClient* client_; 55 ContentLayerClient* client_;
56 scoped_refptr<PicturePile> pile_; 56 scoped_refptr<PicturePile> pile_;
57 devtools_instrumentation:: 57 devtools_instrumentation::
58 ScopedLayerObjectTracker instrumentation_object_tracker_; 58 ScopedLayerObjectTracker instrumentation_object_tracker_;
59 // Invalidation to use the next time update is called. 59 // Invalidation to use the next time update is called.
60 InvalidationRegion pending_invalidation_; 60 InvalidationRegion pending_invalidation_;
61 // Invalidation from the last time update was called. 61 // Invalidation from the last time update was called.
62 Region pile_invalidation_; 62 Region pile_invalidation_;
63 gfx::Rect last_updated_visible_content_rect_; 63 gfx::Rect last_updated_visible_content_rect_;
64 bool is_mask_; 64 bool is_mask_;
65 65
66 int update_source_frame_number_; 66 int update_source_frame_number_;
67 bool can_use_lcd_text_last_frame_; 67 bool can_use_lcd_text_last_frame_;
68 68
69 DISALLOW_COPY_AND_ASSIGN(PictureLayer); 69 DISALLOW_COPY_AND_ASSIGN(PictureLayer);
70 }; 70 };
71 71
72 } // namespace cc 72 } // namespace cc
73 73
74 #endif // CC_LAYERS_PICTURE_LAYER_H_ 74 #endif // CC_LAYERS_PICTURE_LAYER_H_
OLDNEW
« no previous file with comments | « cc/layers/picture_image_layer_impl.h ('k') | cc/layers/picture_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698