src/image/SkImage.cpp - Issue 1375673002: Revert of Revert[2] of add ImageShader, sharing code with its Bitmap cousin

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/image/SkImage.cpp

Issue 1375673002: Revert of Revert[2] of add ImageShader, sharing code with its Bitmap cousin (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 years, 3 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/image/SkImage.cpp

diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp

index ee76a7ea39ed825e357227fe812cb12c5f3b4e67..b639821a95375e019a30b3f599fd3487daa0d85f 100644

--- a/src/image/SkImage.cpp

+++ b/src/image/SkImage.cpp

@@ -11,7 +11,6 @@

#include "SkData.h"

#include "SkImageGenerator.h"

#include "SkImagePriv.h"

-#include "SkImageShader.h"

#include "SkImage_Base.h"

#include "SkNextID.h"

#include "SkPixelRef.h"

@@ -70,7 +69,7 @@

SkShader* SkImage::newShader(SkShader::TileMode tileX,

SkShader::TileMode tileY,

const SkMatrix* localMatrix) const {

- return SkImageShader::Create(this, tileX, tileY, localMatrix);

+ return as_IB(this)->onNewShader(tileX, tileY, localMatrix);

}

SkData* SkImage::encode(SkImageEncoder::Type type, int quality) const {

« no previous file with comments | « gyp/core.gypi ('k') | src/image/SkImageShader.h » ('j') | no next file with comments »