src/core/SkPictureShader.cpp - Issue 1785473002: SkImage now has makeShader to return sk_sp

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.cpp

Issue 1785473002: SkImage now has makeShader to return sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: use build guard for impl of newShader 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:

Index: src/core/SkPictureShader.cpp

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

index a6644aacbab362152fc9691255cc8b73442bc9ed..c2a0b74e23b9e9199deacae402410daf75a9f4aa 100644

--- a/src/core/SkPictureShader.cpp

+++ b/src/core/SkPictureShader.cpp

@@ -231,7 +231,7 @@ sk_sp<SkShader> SkPictureShader::refBitmapShader(const SkMatrix& viewMatrix, con

SkMatrix shaderMatrix = this->getLocalMatrix();

shaderMatrix.preScale(1 / tileScale.width(), 1 / tileScale.height());

- tileShader.reset(tileImage->newShader(fTmx, fTmy, &shaderMatrix));

+ tileShader = tileImage->makeShader(fTmx, fTmy, &shaderMatrix);

const SkImageInfo tileInfo = SkImageInfo::MakeN32Premul(tileSize);

SkResourceCache::Add(new BitmapShaderRec(key, tileShader.get(),

« no previous file with comments | « src/core/SkDevice.cpp ('k') | src/gpu/SkGpuDevice.cpp » ('j') | no next file with comments »