Diff
Modified: trunk/Source/WebCore/ChangeLog (222094 => 222095)
--- trunk/Source/WebCore/ChangeLog 2017-09-15 17:03:00 UTC (rev 222094)
+++ trunk/Source/WebCore/ChangeLog 2017-09-15 17:22:57 UTC (rev 222095)
@@ -1,3 +1,19 @@
+2017-09-15 Antti Koivisto <[email protected]>
+
+ Remove FilterOperation::blendingNeedsRendererSize()
+ https://bugs.webkit.org/show_bug.cgi?id=176994
+
+ Reviewed by Simon Fraser.
+
+ It is not used.
+
+ * page/animation/CSSPropertyAnimation.cpp:
+ (WebCore::blendFunc):
+ * platform/graphics/filters/FilterOperation.h:
+ (WebCore::FilterOperation::blend):
+ (WebCore::FilterOperation::shouldBeRestrictedBySecurityOrigin const):
+ (WebCore::FilterOperation::blendingNeedsRendererSize const): Deleted.
+
2017-09-15 Youenn Fablet <[email protected]>
Add an URL method to remove both query string and fragment identifier
Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (222094 => 222095)
--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2017-09-15 17:03:00 UTC (rev 222094)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2017-09-15 17:22:57 UTC (rev 222095)
@@ -165,13 +165,9 @@
return ShapeValue::create(toShape.blend(fromShape, progress), to->cssBox());
}
-static inline RefPtr<FilterOperation> blendFunc(const AnimationBase* animation, FilterOperation* fromOp, FilterOperation* toOp, double progress, bool blendToPassthrough = false)
+static inline RefPtr<FilterOperation> blendFunc(const AnimationBase*, FilterOperation* fromOp, FilterOperation* toOp, double progress, bool blendToPassthrough = false)
{
ASSERT(toOp);
- if (toOp->blendingNeedsRendererSize()) {
- LayoutSize size = is<RenderBox>(*animation->renderer()) ? downcast<RenderBox>(*animation->renderer()).borderBoxRect().size() : LayoutSize();
- return toOp->blend(fromOp, progress, size, blendToPassthrough);
- }
return toOp->blend(fromOp, progress, blendToPassthrough);
}
Modified: trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h (222094 => 222095)
--- trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h 2017-09-15 17:03:00 UTC (rev 222094)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h 2017-09-15 17:22:57 UTC (rev 222095)
@@ -75,16 +75,9 @@
virtual RefPtr<FilterOperation> blend(const FilterOperation* /*from*/, double /*progress*/, bool /*blendToPassthrough*/ = false)
{
- ASSERT(!blendingNeedsRendererSize());
return nullptr;
}
- virtual RefPtr<FilterOperation> blend(const FilterOperation* /*from*/, double /*progress*/, const LayoutSize&, bool /*blendToPassthrough*/ = false)
- {
- ASSERT(blendingNeedsRendererSize());
- return nullptr;
- }
-
OperationType type() const { return m_type; }
bool isBasicColorMatrixFilterOperation() const
@@ -105,8 +98,6 @@
virtual bool movesPixels() const { return false; }
// True if the filter should not be allowed to work on content that is not available from this security origin.
virtual bool shouldBeRestrictedBySecurityOrigin() const { return false; }
- // True if the filter needs the size of the box in order to calculate the animations.
- virtual bool blendingNeedsRendererSize() const { return false; }
protected:
FilterOperation(OperationType type)
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp (222094 => 222095)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp 2017-09-15 17:03:00 UTC (rev 222094)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp 2017-09-15 17:22:57 UTC (rev 222095)
@@ -26,10 +26,8 @@
namespace WebCore {
-static RefPtr<FilterOperation> blendFunc(FilterOperation* fromOp, FilterOperation& toOp, double progress, const FloatSize& size, bool blendToPassthrough = false)
+static RefPtr<FilterOperation> blendFunc(FilterOperation* fromOp, FilterOperation& toOp, double progress, const FloatSize&, bool blendToPassthrough = false)
{
- if (toOp.blendingNeedsRendererSize())
- return toOp.blend(fromOp, progress, LayoutSize(size), blendToPassthrough);
return toOp.blend(fromOp, progress, blendToPassthrough);
}
