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

Side by Side Diff: cc/layers/picture_layer.h

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 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_unittest.cc ('k') | cc/layers/picture_layer.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_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 "base/macros.h" 8 #include "base/macros.h"
9 #include "cc/base/invalidation_region.h" 9 #include "cc/base/invalidation_region.h"
10 #include "cc/debug/devtools_instrumentation.h" 10 #include "cc/debug/devtools_instrumentation.h"
11 #include "cc/debug/micro_benchmark_controller.h" 11 #include "cc/debug/micro_benchmark_controller.h"
12 #include "cc/layers/layer.h" 12 #include "cc/layers/layer.h"
13 13
14 namespace cc { 14 namespace cc {
15 15
16 class ContentLayerClient; 16 class ContentLayerClient;
17 class RecordingSource; 17 class RecordingSource;
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 void SetNearestNeighbor(bool nearest_neighbor); 26 void SetNearestNeighbor(bool nearest_neighbor);
27 27
28 // Layer interface. 28 // Layer interface.
29 scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override; 29 std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
30 void SetLayerTreeHost(LayerTreeHost* host) override; 30 void SetLayerTreeHost(LayerTreeHost* host) override;
31 void PushPropertiesTo(LayerImpl* layer) override; 31 void PushPropertiesTo(LayerImpl* layer) override;
32 void SetNeedsDisplayRect(const gfx::Rect& layer_rect) override; 32 void SetNeedsDisplayRect(const gfx::Rect& layer_rect) override;
33 bool Update() override; 33 bool Update() override;
34 void SetIsMask(bool is_mask) override; 34 void SetIsMask(bool is_mask) override;
35 sk_sp<SkPicture> GetPicture() const override; 35 sk_sp<SkPicture> GetPicture() const override;
36 bool IsSuitableForGpuRasterization() const override; 36 bool IsSuitableForGpuRasterization() const override;
37 37
38 void RunMicroBenchmark(MicroBenchmark* benchmark) override; 38 void RunMicroBenchmark(MicroBenchmark* benchmark) override;
39 39
40 ContentLayerClient* client() { return client_; } 40 ContentLayerClient* client() { return client_; }
41 41
42 RecordingSource* GetRecordingSourceForTesting() { 42 RecordingSource* GetRecordingSourceForTesting() {
43 return recording_source_.get(); 43 return recording_source_.get();
44 } 44 }
45 45
46 protected: 46 protected:
47 explicit PictureLayer(ContentLayerClient* client); 47 explicit PictureLayer(ContentLayerClient* client);
48 // Allow tests to inject a recording source. 48 // Allow tests to inject a recording source.
49 PictureLayer(ContentLayerClient* client, scoped_ptr<RecordingSource> source); 49 PictureLayer(ContentLayerClient* client,
50 std::unique_ptr<RecordingSource> source);
50 ~PictureLayer() override; 51 ~PictureLayer() override;
51 52
52 bool HasDrawableContent() const override; 53 bool HasDrawableContent() const override;
53 void SetTypeForProtoSerialization(proto::LayerNode* proto) const override; 54 void SetTypeForProtoSerialization(proto::LayerNode* proto) const override;
54 void LayerSpecificPropertiesToProto(proto::LayerProperties* proto) override; 55 void LayerSpecificPropertiesToProto(proto::LayerProperties* proto) override;
55 void FromLayerSpecificPropertiesProto( 56 void FromLayerSpecificPropertiesProto(
56 const proto::LayerProperties& proto) override; 57 const proto::LayerProperties& proto) override;
57 58
58 bool is_mask() const { return is_mask_; } 59 bool is_mask() const { return is_mask_; }
59 60
60 private: 61 private:
61 friend class TestSerializationPictureLayer; 62 friend class TestSerializationPictureLayer;
62 63
63 void DropRecordingSourceContentIfInvalid(); 64 void DropRecordingSourceContentIfInvalid();
64 65
65 ContentLayerClient* client_; 66 ContentLayerClient* client_;
66 scoped_ptr<RecordingSource> recording_source_; 67 std::unique_ptr<RecordingSource> recording_source_;
67 devtools_instrumentation:: 68 devtools_instrumentation::
68 ScopedLayerObjectTracker instrumentation_object_tracker_; 69 ScopedLayerObjectTracker instrumentation_object_tracker_;
69 70
70 Region last_updated_invalidation_; 71 Region last_updated_invalidation_;
71 72
72 int update_source_frame_number_; 73 int update_source_frame_number_;
73 bool is_mask_; 74 bool is_mask_;
74 bool nearest_neighbor_; 75 bool nearest_neighbor_;
75 76
76 DISALLOW_COPY_AND_ASSIGN(PictureLayer); 77 DISALLOW_COPY_AND_ASSIGN(PictureLayer);
77 }; 78 };
78 79
79 } // namespace cc 80 } // namespace cc
80 81
81 #endif // CC_LAYERS_PICTURE_LAYER_H_ 82 #endif // CC_LAYERS_PICTURE_LAYER_H_
OLDNEW
« no previous file with comments | « cc/layers/picture_image_layer_unittest.cc ('k') | cc/layers/picture_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698