| Index: src/effects/SkDisplacementMapEffect.cpp
|
| diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
|
| index a5519d1e9aad44f9310fe67d45122f75180eda66..cd6ac3dca760d722422a211fe45f03a13c2bf631 100644
|
| --- a/src/effects/SkDisplacementMapEffect.cpp
|
| +++ b/src/effects/SkDisplacementMapEffect.cpp
|
| @@ -161,10 +161,9 @@ bool channel_selector_type_is_valid(SkDisplacementMapEffect::ChannelSelectorType
|
| SkDisplacementMapEffect::SkDisplacementMapEffect(ChannelSelectorType xChannelSelector,
|
| ChannelSelectorType yChannelSelector,
|
| SkScalar scale,
|
| - SkImageFilter* displacement,
|
| - SkImageFilter* color,
|
| + SkImageFilter* inputs[2],
|
| const CropRect* cropRect)
|
| - : INHERITED(displacement, color, cropRect)
|
| + : INHERITED(2, inputs, cropRect)
|
| , fXChannelSelector(xChannelSelector)
|
| , fYChannelSelector(yChannelSelector)
|
| , fScale(scale)
|
|
|