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

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

Issue 1869753003: Replace many skia::RefPtr with sk_sp<> in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Florin's nits Created 4 years, 7 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/blink/web_image_layer_impl.cc ('k') | cc/layers/picture_image_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 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_PICTURE_IMAGE_LAYER_H_ 5 #ifndef CC_LAYERS_PICTURE_IMAGE_LAYER_H_
6 #define CC_LAYERS_PICTURE_IMAGE_LAYER_H_ 6 #define CC_LAYERS_PICTURE_IMAGE_LAYER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "cc/base/cc_export.h" 11 #include "cc/base/cc_export.h"
12 #include "cc/layers/content_layer_client.h" 12 #include "cc/layers/content_layer_client.h"
13 #include "cc/layers/picture_layer.h" 13 #include "cc/layers/picture_layer.h"
14 #include "skia/ext/refptr.h" 14 #include "skia/ext/refptr.h"
15 #include "third_party/skia/include/core/SkRefCnt.h"
15 #include "ui/gfx/geometry/size.h" 16 #include "ui/gfx/geometry/size.h"
16 17
17 class SkImage; 18 class SkImage;
18 19
19 namespace cc { 20 namespace cc {
20 21
21 class CC_EXPORT PictureImageLayer : public PictureLayer, ContentLayerClient { 22 class CC_EXPORT PictureImageLayer : public PictureLayer, ContentLayerClient {
22 public: 23 public:
23 static scoped_refptr<PictureImageLayer> Create(); 24 static scoped_refptr<PictureImageLayer> Create();
24 25
25 void SetImage(skia::RefPtr<const SkImage> image); 26 void SetImage(sk_sp<const SkImage> image);
26 27
27 // Layer implementation. 28 // Layer implementation.
28 std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override; 29 std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
29 30
30 gfx::Rect PaintableRegion() override; 31 gfx::Rect PaintableRegion() override;
31 32
32 // ContentLayerClient implementation. 33 // ContentLayerClient implementation.
33 scoped_refptr<DisplayItemList> PaintContentsToDisplayList( 34 scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
34 ContentLayerClient::PaintingControlSetting painting_control) override; 35 ContentLayerClient::PaintingControlSetting painting_control) override;
35 bool FillsBoundsCompletely() const override; 36 bool FillsBoundsCompletely() const override;
36 size_t GetApproximateUnsharedMemoryUsage() const override; 37 size_t GetApproximateUnsharedMemoryUsage() const override;
37 38
38 protected: 39 protected:
39 bool HasDrawableContent() const override; 40 bool HasDrawableContent() const override;
40 41
41 private: 42 private:
42 PictureImageLayer(); 43 PictureImageLayer();
43 ~PictureImageLayer() override; 44 ~PictureImageLayer() override;
44 45
45 skia::RefPtr<const SkImage> image_; 46 sk_sp<const SkImage> image_;
46 47
47 DISALLOW_COPY_AND_ASSIGN(PictureImageLayer); 48 DISALLOW_COPY_AND_ASSIGN(PictureImageLayer);
48 }; 49 };
49 50
50 } // namespace cc 51 } // namespace cc
51 52
52 #endif // CC_LAYERS_PICTURE_IMAGE_LAYER_H_ 53 #endif // CC_LAYERS_PICTURE_IMAGE_LAYER_H_
OLDNEW
« no previous file with comments | « cc/blink/web_image_layer_impl.cc ('k') | cc/layers/picture_image_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698