| Index: Source/platform/graphics/filters/FEDisplacementMap.cpp
|
| diff --git a/Source/platform/graphics/filters/FEDisplacementMap.cpp b/Source/platform/graphics/filters/FEDisplacementMap.cpp
|
| index 32dcb2bf61b16b4267d18e5a8b2a6aa74465e36e..a804ecf4d385fd80930a3ed6e84ae18cecbc7213 100644
|
| --- a/Source/platform/graphics/filters/FEDisplacementMap.cpp
|
| +++ b/Source/platform/graphics/filters/FEDisplacementMap.cpp
|
| @@ -176,48 +176,6 @@ static SkDisplacementMapEffect::ChannelSelectorType toSkiaMode(ChannelSelectorTy
|
| }
|
| }
|
|
|
| -bool FEDisplacementMap::applySkia()
|
| -{
|
| - // For now, only use the skia implementation for accelerated rendering.
|
| - if (!filter()->isAccelerated())
|
| - return false;
|
| -
|
| - FilterEffect* in = inputEffect(0);
|
| - FilterEffect* in2 = inputEffect(1);
|
| -
|
| - if (!in || !in2)
|
| - return false;
|
| -
|
| - ImageBuffer* resultImage = createImageBufferResult();
|
| - if (!resultImage)
|
| - return false;
|
| -
|
| - RefPtr<Image> color = in->asImageBuffer()->copyImage(DontCopyBackingStore);
|
| - RefPtr<Image> displ = in2->asImageBuffer()->copyImage(DontCopyBackingStore);
|
| -
|
| - RefPtr<NativeImageSkia> colorNativeImage = color->nativeImageForCurrentFrame();
|
| - RefPtr<NativeImageSkia> displNativeImage = displ->nativeImageForCurrentFrame();
|
| -
|
| - if (!colorNativeImage || !displNativeImage)
|
| - return false;
|
| -
|
| - SkBitmap colorBitmap = colorNativeImage->bitmap();
|
| - SkBitmap displBitmap = displNativeImage->bitmap();
|
| -
|
| - SkAutoTUnref<SkImageFilter> colorSource(new SkBitmapSource(colorBitmap));
|
| - SkAutoTUnref<SkImageFilter> displSource(new SkBitmapSource(displBitmap));
|
| - SkDisplacementMapEffect::ChannelSelectorType typeX = toSkiaMode(m_xChannelSelector);
|
| - SkDisplacementMapEffect::ChannelSelectorType typeY = toSkiaMode(m_yChannelSelector);
|
| - // FIXME : Only applyHorizontalScale is used and applyVerticalScale is ignored
|
| - // This can be fixed by adding a 2nd scale parameter to SkDisplacementMapEffect
|
| - SkAutoTUnref<SkImageFilter> displEffect(new SkDisplacementMapEffect(
|
| - typeX, typeY, SkFloatToScalar(filter()->applyHorizontalScale(m_scale)), displSource, colorSource));
|
| - SkPaint paint;
|
| - paint.setImageFilter(displEffect);
|
| - resultImage->context()->drawBitmap(colorBitmap, 0, 0, &paint);
|
| - return true;
|
| -}
|
| -
|
| PassRefPtr<SkImageFilter> FEDisplacementMap::createImageFilter(SkiaImageFilterBuilder* builder)
|
| {
|
| RefPtr<SkImageFilter> color = builder->build(inputEffect(0), operatingColorSpace());
|
|
|