src/effects/SkLightingImageFilter.cpp - Issue 27471002: Implement crop rect support for SkMatrixConvolutionImageFilter.

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/effects/SkLightingImageFilter.cpp

Issue 27471002: Implement crop rect support for SkMatrixConvolutionImageFilter. (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Fix comment Created 7 years, 2 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/effects/SkLightingImageFilter.cpp

diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp

index d34bd7a5d7fc727a7bd34c277cbd06b67dd02a50..f81cc1c914b7b426e0fe586319ea2d64f2c2593e 100644

--- a/src/effects/SkLightingImageFilter.cpp

+++ b/src/effects/SkLightingImageFilter.cpp

@@ -270,7 +270,7 @@ protected:

virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,

SkBitmap* result, SkIPoint* offset) SK_OVERRIDE;

#if SK_SUPPORT_GPU

- virtual bool asNewEffect(GrEffectRef** effect, GrTexture*, const SkMatrix& matrix) const SK_OVERRIDE;

+ virtual bool asNewEffect(GrEffectRef** effect, GrTexture*, const SkMatrix& matrix, const SkIRect& bounds) const SK_OVERRIDE;

#endif

private:

@@ -292,7 +292,7 @@ protected:

virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,

SkBitmap* result, SkIPoint* offset) SK_OVERRIDE;

#if SK_SUPPORT_GPU

- virtual bool asNewEffect(GrEffectRef** effect, GrTexture*, const SkMatrix& matrix) const SK_OVERRIDE;

+ virtual bool asNewEffect(GrEffectRef** effect, GrTexture*, const SkMatrix& matrix, const SkIRect& bounds) const SK_OVERRIDE;

#endif

private:

@@ -957,7 +957,7 @@ bool SkDiffuseLightingImageFilter::onFilterImage(Proxy*,

}

#if SK_SUPPORT_GPU

-bool SkDiffuseLightingImageFilter::asNewEffect(GrEffectRef** effect, GrTexture* texture, const SkMatrix& matrix) const {

+bool SkDiffuseLightingImageFilter::asNewEffect(GrEffectRef** effect, GrTexture* texture, const SkMatrix& matrix, const SkIRect&) const {

if (effect) {

SkScalar scale = SkScalarMul(surfaceScale(), SkIntToScalar(255));

*effect = GrDiffuseLightingEffect::Create(texture, light(), scale, matrix, kd());

@@ -1033,7 +1033,7 @@ bool SkSpecularLightingImageFilter::onFilterImage(Proxy*,

}

#if SK_SUPPORT_GPU

-bool SkSpecularLightingImageFilter::asNewEffect(GrEffectRef** effect, GrTexture* texture, const SkMatrix& matrix) const {

+bool SkSpecularLightingImageFilter::asNewEffect(GrEffectRef** effect, GrTexture* texture, const SkMatrix& matrix, const SkIRect&) const {

if (effect) {

SkScalar scale = SkScalarMul(surfaceScale(), SkIntToScalar(255));

*effect = GrSpecularLightingEffect::Create(texture, light(), scale, matrix, ks(), shininess());