src/core/SkPictureShader.h - Issue 1789443002: Revert "Revert of add Make variations to return SkImage by sk_sp (patchset #5 id:80001 of https://c…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/core/SkPictureShader.h

Issue 1789443002: Revert "Revert of add Make variations to return SkImage by sk_sp (patchset #5 id:80001 of https://c… (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: use get, not release, when calling legacy function that wants ptr Created 4 years, 9 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 side-by-side diff with in-line comments

Download patch

Index: src/core/SkPictureShader.h

diff --git a/src/core/SkPictureShader.h b/src/core/SkPictureShader.h

index eb9c38b95b499f664074aedff4a27304bb361a99..8f167b815eb4dc5cd09f55959838b418bd2fd2e3 100644

--- a/src/core/SkPictureShader.h

+++ b/src/core/SkPictureShader.h

@@ -22,7 +22,7 @@ class SkPicture;

class SkPictureShader : public SkShader {

public:

- static sk_sp<SkShader> Make(sk_sp<const SkPicture>, TileMode, TileMode, const SkMatrix*,

+ static sk_sp<SkShader> Make(sk_sp<SkPicture>, TileMode, TileMode, const SkMatrix*,

const SkRect*);

SK_TO_STRING_OVERRIDE()

@@ -42,14 +42,14 @@ protected:

Context* onCreateContext(const ContextRec&, void* storage) const override;

private:

- SkPictureShader(sk_sp<const SkPicture>, TileMode, TileMode, const SkMatrix*, const SkRect*);

+ SkPictureShader(sk_sp<SkPicture>, TileMode, TileMode, const SkMatrix*, const SkRect*);

sk_sp<SkShader> refBitmapShader(const SkMatrix&, const SkMatrix* localMatrix,

const int maxTextureSize = 0) const;

- sk_sp<const SkPicture> fPicture;

- SkRect fTile;

- TileMode fTmx, fTmy;

+ sk_sp<SkPicture> fPicture;

+ SkRect fTile;

+ TileMode fTmx, fTmy;

class PictureShaderContext : public SkShader::Context {

public:

« no previous file with comments | « src/c/sk_surface.cpp ('k') | src/core/SkPictureShader.cpp » ('j') | no next file with comments »