Merge ReferenceFilter into Filter

Source/core/paint/SVGFilterPainter.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/SVGFilterPainter.h"
 
 #include "core/layout/svg/LayoutSVGResourceFilter.h"
 #include "core/layout/svg/SVGLayoutSupport.h"
 #include "core/paint/CompositingRecorder.h"
@@ skipping 26 matching lines @@
     }
 
     filterData->m_state = FilterData::RecordingContent;
     return context;
 }
 
 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();
 
     // For slimming paint we need to use the context that contains the filtered
     // content.
     if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
         ASSERT(m_displayItemList);
         ASSERT(m_context);
         context = m_context.get();
         context->beginRecording(filterData->filter->filterRegion());
         m_displayItemList->commitNewDisplayItemsAndReplay(*context);
     }
 
     sourceGraphic->setPicture(context->endRecording());
 
     // Content is cached by the source graphic so temporaries can be freed.
     if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
         m_displayItemList = nullptr;
         m_context = nullptr;
     }
 
     filterData->m_state = FilterData::ReadyToPaint;
 }
 
 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
     // TODO: Remove this workaround once skew/rotation support is added in Skia
     // (https://code.google.com/p/skia/issues/detail?id=3288, crbug.com/446935).
     // If the CTM contains rotation or shearing, apply the filter to
     // the unsheared/unrotated matrix, and do the shearing/rotation
     // as a final pass.
     AffineTransform ctm = SVGLayoutSupport::deprecatedCalculateTransformToLayer(&object);
     if (ctm.b() || ctm.c()) {
@@ skipping 46 matching lines @@
     FloatRect drawingRegion = object.strokeBoundingBox();
     drawingRegion.intersect(filterRegion);
     bool primitiveBoundingBoxMode = filterElement->primitiveUnits()->currentValue()->enumValue() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX;
     filterData->filter = SVGFilter::create(enclosingIntRect(drawingRegion), targetBoundingBox, filterRegion, primitiveBoundingBoxMode);
 
     // Create all relevant filter primitives.
     filterData->builder = m_filter.buildPrimitives(filterData->filter.get());
     if (!filterData->builder)
         return nullptr;
 
-    FilterEffect* lastEffect = filterData->builder->lastEffect();
+    FilterEffect* lastEffect = filterData->filter->lastEffect();
     if (!lastEffect)
         return nullptr;
 
     lastEffect->determineFilterPrimitiveSubregion(ClipToFilterRegion);
 
     FilterData* data = filterData.get();
     m_filter.setFilterDataForLayoutObject(&object, filterData.release());
     return recordingContext.beginContent(data);
 }
 
@@ skipping 21 matching lines @@
     if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*context, object, DisplayItem::SVGFilter, LayoutPoint()))
         return;
 
     // TODO(chrishtr): stop using an infinite rect, and instead bound the filter.
     LayoutObjectDrawingRecorder recorder(*context, object, DisplayItem::SVGFilter, LayoutRect::infiniteIntRect(), LayoutPoint());
     if (filterData && filterData->m_state == FilterData::ReadyToPaint)
         paintFilteredContent(object, context, filterData);
 }
 
 }