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

Side by Side Diff: src/image/SkImageShader.h

Issue 2239723002: fix memory leak, remake Imageshader to use sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 4 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 | « src/image/SkImage.cpp ('k') | src/image/SkImageShader.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef SkImageShader_DEFINED 8 #ifndef SkImageShader_DEFINED
9 #define SkImageShader_DEFINED 9 #define SkImageShader_DEFINED
10 10
11 #include "SkImage.h" 11 #include "SkImage.h"
12 #include "SkShader.h" 12 #include "SkShader.h"
13 #include "SkBitmapProcShader.h" 13 #include "SkBitmapProcShader.h"
14 14
15 class SkImageShader : public SkShader { 15 class SkImageShader : public SkShader {
16 public: 16 public:
17 static sk_sp<SkShader> Make(const SkImage*, TileMode tx, TileMode ty, 17 static sk_sp<SkShader> Make(sk_sp<SkImage>, TileMode tx, TileMode ty,
18 const SkMatrix* localMatrix, SkTBlitterAllocator * = nullptr); 18 const SkMatrix* localMatrix, SkTBlitterAllocator * = nullptr);
19 19
20 bool isOpaque() const override; 20 bool isOpaque() const override;
21 21
22 SK_TO_STRING_OVERRIDE() 22 SK_TO_STRING_OVERRIDE()
23 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkImageShader) 23 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkImageShader)
24 24
25 #if SK_SUPPORT_GPU 25 #if SK_SUPPORT_GPU
26 sk_sp<GrFragmentProcessor> asFragmentProcessor(const AsFPArgs&) const overri de; 26 sk_sp<GrFragmentProcessor> asFragmentProcessor(const AsFPArgs&) const overri de;
27 #endif 27 #endif
28 28
29 SkImageShader(const SkImage*, TileMode tx, TileMode ty, const SkMatrix* loca lMatrix); 29 SkImageShader(sk_sp<SkImage>, TileMode tx, TileMode ty, const SkMatrix* loca lMatrix);
30 30
31 protected: 31 protected:
32 void flatten(SkWriteBuffer&) const override; 32 void flatten(SkWriteBuffer&) const override;
33 size_t onContextSize(const ContextRec&) const override; 33 size_t onContextSize(const ContextRec&) const override;
34 Context* onCreateContext(const ContextRec&, void* storage) const override; 34 Context* onCreateContext(const ContextRec&, void* storage) const override;
35 bool onIsABitmap(SkBitmap*, SkMatrix*, TileMode*) const override; 35 bool onIsABitmap(SkBitmap*, SkMatrix*, TileMode*) const override;
36 SkImage* onIsAImage(SkMatrix*, TileMode*) const override; 36 SkImage* onIsAImage(SkMatrix*, TileMode*) const override;
37 37
38 SkAutoTUnref<const SkImage> fImage; 38 sk_sp<SkImage> fImage;
39 const TileMode fTileModeX; 39 const TileMode fTileModeX;
40 const TileMode fTileModeY; 40 const TileMode fTileModeY;
41 41
42 private: 42 private:
43 friend class SkShader; 43 friend class SkShader;
44 44
45 typedef SkShader INHERITED; 45 typedef SkShader INHERITED;
46 }; 46 };
47 47
48 #endif 48 #endif
OLDNEW
« no previous file with comments | « src/image/SkImage.cpp ('k') | src/image/SkImageShader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698