| Index: include/effects/SkDisplacementMapEffect.h
|
| diff --git a/include/effects/SkDisplacementMapEffect.h b/include/effects/SkDisplacementMapEffect.h
|
| index 18f9df866e4355439c3c394bcfe00012ce47d1e2..5efbf50e444768833e4c3adbfab6e7bf431e939b 100644
|
| --- a/include/effects/SkDisplacementMapEffect.h
|
| +++ b/include/effects/SkDisplacementMapEffect.h
|
| @@ -22,7 +22,10 @@ public:
|
| kKeyBits = 3 // Max value is 4, so 3 bits are required at most
|
| };
|
|
|
| - SkDisplacementMapEffect(ChannelSelectorType xChannelSelector, ChannelSelectorType yChannelSelector, SkScalar scale, SkImageFilter* displacement, SkImageFilter* color = NULL);
|
| + SkDisplacementMapEffect(ChannelSelectorType xChannelSelector,
|
| + ChannelSelectorType yChannelSelector,
|
| + SkScalar scale, SkImageFilter* displacement,
|
| + SkImageFilter* color = NULL);
|
|
|
| ~SkDisplacementMapEffect();
|
|
|
| @@ -35,7 +38,8 @@ public:
|
| SkIPoint* offset) SK_OVERRIDE;
|
| #if SK_SUPPORT_GPU
|
| virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; }
|
| - virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, SkBitmap* result) SK_OVERRIDE;
|
| + virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, SkBitmap* result,
|
| + SkIPoint* offset) SK_OVERRIDE;
|
| #endif
|
|
|
| protected:
|
|
|