Merge ReferenceFilter into Filter

Source/core/paint/SVGFilterPainter.cpp

Index: Source/core/paint/SVGFilterPainter.cpp
diff --git a/Source/core/paint/SVGFilterPainter.cpp b/Source/core/paint/SVGFilterPainter.cpp
index f7646a622ca9c9b4ce669fa313ef401ae2f7a2cb..247ea39b44452e1dd6141ef03192050eb91be43c 100644
--- a/Source/core/paint/SVGFilterPainter.cpp
+++ b/Source/core/paint/SVGFilterPainter.cpp
@@ -45,7 +45,7 @@ void SVGFilterRecordingContext::endContent(FilterData* filterData)
     ASSERT(filterData->m_state == FilterData::RecordingContent);
 
     // FIXME: maybe filterData should just hold onto SourceGraphic after creation?

[Stephen White, 2015/09/14 18:49:34]

You can probably get rid of the comment now -- we're no longer looking it up by
ID (which was the gross part).

[fs, 2015/09/15 10:42:56]

Done.

-    SourceGraphic* sourceGraphic = static_cast<SourceGraphic*>(filterData->builder->getEffectById(SourceGraphic::effectName()));
+    SourceGraphic* sourceGraphic = filterData->filter->sourceGraphic();
     ASSERT(sourceGraphic);
 
     GraphicsContext* context = paintingContext();
@@ -74,17 +74,17 @@ void SVGFilterRecordingContext::endContent(FilterData* filterData)
 static void paintFilteredContent(LayoutObject& object, GraphicsContext* context, FilterData* filterData)
 {
     ASSERT(filterData->m_state == FilterData::ReadyToPaint);
-    ASSERT(filterData->builder->getEffectById(SourceGraphic::effectName()));
+    ASSERT(filterData->filter->sourceGraphic());
 
     filterData->m_state = FilterData::PaintingFilter;
 
     SkiaImageFilterBuilder builder;
-    RefPtr<SkImageFilter> imageFilter = builder.build(filterData->builder->lastEffect(), ColorSpaceDeviceRGB);
+    RefPtr<SkImageFilter> imageFilter = builder.build(filterData->filter->lastEffect(), ColorSpaceDeviceRGB);
     FloatRect boundaries = filterData->filter->filterRegion();
     context->save();
 
     // Clip drawing of filtered image to the minimum required paint rect.
-    FilterEffect* lastEffect = filterData->builder->lastEffect();
+    FilterEffect* lastEffect = filterData->filter->lastEffect();
     context->clipRect(lastEffect->determineAbsolutePaintRect(lastEffect->maxEffectRect()));
 
 #ifdef CHECK_CTM_FOR_TRANSFORMED_IMAGEFILTER
@@ -151,7 +151,7 @@ GraphicsContext* SVGFilterPainter::prepareEffect(LayoutObject& object, SVGFilter
     if (!filterData->builder)
         return nullptr;
 
-    FilterEffect* lastEffect = filterData->builder->lastEffect();
+    FilterEffect* lastEffect = filterData->filter->lastEffect();
     if (!lastEffect)
         return nullptr;