| Index: third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp b/third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp
|
| index 31c9bb7a6d1ee057d49c5e0f2a6ea6edb1a67838..ace6f896383c0d169b0e43f44c6b30ee09387352 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp
|
| @@ -36,7 +36,9 @@
|
| #include "platform/graphics/filters/FilterOperations.h"
|
| #include "platform/graphics/filters/SourceGraphic.h"
|
| #include "platform/graphics/skia/SkiaUtils.h"
|
| +#include "third_party/skia/include/core/SkPicture.h"
|
| #include "third_party/skia/include/core/SkXfermode.h"
|
| +#include "third_party/skia/include/effects/SkPictureImageFilter.h"
|
| #include "third_party/skia/include/effects/SkXfermodeImageFilter.h"
|
|
|
| namespace blink {
|
| @@ -182,9 +184,19 @@ sk_sp<SkImageFilter> buildTransform(const AffineTransform& transform, sk_sp<SkIm
|
|
|
| sk_sp<SkImageFilter> buildBoxReflectFilter(const BoxReflection& reflection, sk_sp<SkImageFilter> input)
|
| {
|
| - sk_sp<SkImageFilter> maskedInput = input;
|
| - // TODO(jbroman): If a mask image is provided, mask!
|
| -
|
| + sk_sp<SkImageFilter> maskedInput;
|
| + if (SkPicture* maskPicture = reflection.mask()) {
|
| + // SkXfermodeImageFilter can choose an excessively large size if the
|
| + // mask is smaller than the filtered contents (due to overflow).
|
| + // http://skbug.com/5210
|
| + SkImageFilter::CropRect cropRect(maskPicture->cullRect());
|
| + maskedInput = SkXfermodeImageFilter::Make(
|
| + SkXfermode::Make(SkXfermode::kSrcIn_Mode),
|
| + SkPictureImageFilter::Make(sk_ref_sp(maskPicture)),
|
| + input, &cropRect);
|
| + } else {
|
| + maskedInput = input;
|
| + }
|
| sk_sp<SkImageFilter> flipImageFilter = SkImageFilter::MakeMatrixFilter(
|
| reflection.reflectionMatrix(), kLow_SkFilterQuality, std::move(maskedInput));
|
| return SkXfermodeImageFilter::Make(nullptr, std::move(flipImageFilter), std::move(input), nullptr);
|
|
|