third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp - Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation

Unified Diff: third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp

Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add WTF_MAKE_NONCOPYABLE. Remove INSIDE_BLINK for keyframes. Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/platform/graphics/DEPS ('K') | « third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.h ('k') | third_party/WebKit/Source/platform/graphics/paint/FilterDisplayItem.h » ('j') | third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 94171b28a67869bd07a95f4e403ccdcf60772fdd..e08a3fac3e1a9b5fae36d579646e206cdeb6c7b6 100644

--- a/third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp

+++ b/third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp

@@ -29,11 +29,11 @@

#include "SkColorFilterImageFilter.h"

#include "SkColorMatrixFilter.h"

#include "SkTableColorFilter.h"

+#include "platform/geometry/IntPoint.h"

#include "platform/graphics/filters/FilterEffect.h"

#include "platform/graphics/filters/FilterOperations.h"

#include "platform/graphics/filters/SourceGraphic.h"

#include "platform/graphics/skia/SkiaUtils.h"

-#include "public/platform/WebPoint.h"

namespace blink {

@@ -70,7 +70,7 @@ PassRefPtr<SkImageFilter> SkiaImageFilterBuilder::transformColorSpace(

return adoptRef(SkColorFilterImageFilter::Create(colorFilter.get(), input));

}

-void SkiaImageFilterBuilder::buildFilterOperations(const FilterOperations& operations, WebFilterOperations* filters)

+void SkiaImageFilterBuilder::buildFilterOperations(const FilterOperations& operations, CompositorFilterOperations* filters)

{

ColorSpace currentColorSpace = ColorSpaceDeviceRGB;

SkImageFilter* const nullFilter = 0;

@@ -157,7 +157,7 @@ void SkiaImageFilterBuilder::buildFilterOperations(const FilterOperations& opera

}

case FilterOperation::DROP_SHADOW: {

const DropShadowFilterOperation& drop = toDropShadowFilterOperation(op);

- filters->appendDropShadowFilter(WebPoint(drop.x(), drop.y()), drop.stdDeviation(), drop.color().rgb());

+ filters->appendDropShadowFilter(IntPoint(drop.x(), drop.y()), drop.stdDeviation(), drop.color());

jbroman 2016/02/01 15:44:36 nit: drop.location() is already IntPoint(drop.x(),

loyso (OOO) 2016/02/04 05:49:29 Done.

break;

}

case FilterOperation::NONE: