src/core/SkPictureShader.cpp - Issue 279903002: reland hide get/setLocalMatrix

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 279903002: reland hide get/setLocalMatrix (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: remember global initialization of flattenables Created 6 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:

Index: src/core/SkPictureShader.cpp

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

index 300a65329be41c719b67bb0b15aa8b0995e4de72..ecb86e7e7150e851d14d2e0fa744dd292dfac62f 100644

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

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

@@ -56,11 +56,7 @@ SkShader* SkPictureShader::refBitmapShader(const SkMatrix& matrix, const SkMatri

SkASSERT(fPicture && fPicture->width() > 0 && fPicture->height() > 0);

SkMatrix m;

- if (this->hasLocalMatrix()) {

- m.setConcat(matrix, this->getLocalMatrix());

- } else {

- m = matrix;

- }

+ m.setConcat(matrix, this->getLocalMatrix());

if (localM) {

m.preConcat(*localM);

}