From ab3c30d97e98cbddada2194d9e6d48c1ced65681 Mon Sep 17 00:00:00 2001 From: Viet-Trung Luu Date: Tue, 21 Apr 2015 13:15:25 -0700 Subject: [PATCH] Roll skia to 409fd66a5afcef5f165f7ccec7c3473add231752. R=jamesr@chromium.org Review URL: https://codereview.chromium.org/1100833002 --- engine/platform/graphics/GraphicsContext.cpp | 3 +-- engine/platform/graphics/filters/SkiaImageFilterBuilder.cpp | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/engine/platform/graphics/GraphicsContext.cpp b/engine/platform/graphics/GraphicsContext.cpp index 5a8458b0486..f92e64f526a 100644 --- a/engine/platform/graphics/GraphicsContext.cpp +++ b/engine/platform/graphics/GraphicsContext.cpp @@ -45,7 +45,6 @@ #include "third_party/skia/include/core/SkColorFilter.h" #include "third_party/skia/include/core/SkData.h" #include "third_party/skia/include/core/SkDevice.h" -#include "third_party/skia/include/core/SkMatrixImageFilter.h" #include "third_party/skia/include/core/SkPicture.h" #include "third_party/skia/include/core/SkRRect.h" #include "third_party/skia/include/core/SkRefCnt.h" @@ -913,7 +912,7 @@ void GraphicsContext::drawPicture(PassRefPtr picture, const FloatRect RefPtr pictureFilter = adoptRef(SkPictureImageFilter::Create(picture.get(), sourceBounds)); SkMatrix layerScale; layerScale.setScale(deviceDest.width() / src.width(), deviceDest.height() / src.height()); - RefPtr matrixFilter = adoptRef(SkMatrixImageFilter::Create(layerScale, kLow_SkFilterQuality, pictureFilter.get())); + RefPtr matrixFilter = adoptRef(SkImageFilter::CreateMatrixFilter(layerScale, kLow_SkFilterQuality, pictureFilter.get())); SkPaint picturePaint; picturePaint.setXfermodeMode(WebCoreCompositeToSkiaComposite(op, blendMode)); picturePaint.setImageFilter(matrixFilter.get()); diff --git a/engine/platform/graphics/filters/SkiaImageFilterBuilder.cpp b/engine/platform/graphics/filters/SkiaImageFilterBuilder.cpp index b9738552808..ad558b24498 100644 --- a/engine/platform/graphics/filters/SkiaImageFilterBuilder.cpp +++ b/engine/platform/graphics/filters/SkiaImageFilterBuilder.cpp @@ -32,10 +32,8 @@ #include "sky/engine/platform/graphics/filters/SourceGraphic.h" #include "sky/engine/platform/graphics/skia/SkiaUtils.h" #include "sky/engine/public/platform/WebPoint.h" -#include "third_party/skia/include/core/SkMatrixImageFilter.h" #include "third_party/skia/include/effects/SkBlurImageFilter.h" #include "third_party/skia/include/effects/SkColorFilterImageFilter.h" -#include "third_party/skia/include/effects/SkColorMatrixFilter.h" #include "third_party/skia/include/effects/SkDropShadowImageFilter.h" #include "third_party/skia/include/effects/SkTableColorFilter.h" @@ -88,7 +86,7 @@ PassRefPtr SkiaImageFilterBuilder::transformColorSpace( PassRefPtr SkiaImageFilterBuilder::buildTransform(const AffineTransform& transform, SkImageFilter* input) { - return adoptRef(SkMatrixImageFilter::Create(affineTransformToSkMatrix(transform), kHigh_SkFilterQuality, input)); + return adoptRef(SkImageFilter::CreateMatrixFilter(affineTransformToSkMatrix(transform), kHigh_SkFilterQuality, input)); } } // namespace blink