Split SVGFilterbuilder into "builder" and "node map" parts

third_party/WebKit/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 104 matching lines @@
         if (filterData->m_state == FilterData::PaintingFilter)
             filterData->m_state = FilterData::PaintingFilterCycleDetected;
 
         if (filterData->m_state == FilterData::RecordingContent)
             filterData->m_state = FilterData::RecordingContentCycleDetected;
 
         return nullptr;
     }
 
     OwnPtrWillBeRawPtr<FilterData> filterData = FilterData::create();
-    FloatRect targetBoundingBox = object.objectBoundingBox();
+    FloatRect referenceBox = object.objectBoundingBox();
 
     SVGFilterElement* filterElement = toSVGFilterElement(m_filter.element());
-    FloatRect filterRegion = SVGLengthContext::resolveRectangle<SVGFilterElement>(filterElement, filterElement->filterUnits()->currentValue()->enumValue(), targetBoundingBox);
+    FloatRect filterRegion = SVGLengthContext::resolveRectangle<SVGFilterElement>(filterElement, filterElement->filterUnits()->currentValue()->enumValue(), referenceBox);
     if (filterRegion.isEmpty())
         return nullptr;
 
     // Create the SVGFilter object.
     bool primitiveBoundingBoxMode = filterElement->primitiveUnits()->currentValue()->enumValue() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX;
     Filter::UnitScaling unitScaling = primitiveBoundingBoxMode ? Filter::BoundingBox : Filter::UserSpace;
-    filterData->filter = Filter::create(targetBoundingBox, filterRegion, 1, unitScaling);
+    filterData->filter = Filter::create(referenceBox, filterRegion, 1, unitScaling);
+    filterData->nodeMap = SVGFilterGraphNodeMap::create();
 
     IntRect sourceRegion = enclosingIntRect(intersection(filterRegion, object.strokeBoundingBox()));
     filterData->filter->sourceGraphic()->setSourceRect(sourceRegion);
 
     // Create all relevant filter primitives.
-    filterData->builder = m_filter.buildPrimitives(filterData->filter.get());
-    if (!filterData->builder)
-        return nullptr;
+    SVGFilterBuilder builder(filterData->filter->sourceGraphic(), filterData->nodeMap.get());
+    builder.buildGraph(filterData->filter.get(), *filterElement, referenceBox);
 
-    FilterEffect* lastEffect = filterData->filter->lastEffect();
+    FilterEffect* lastEffect = builder.lastEffect();
     if (!lastEffect)
         return nullptr;
 
     lastEffect->determineFilterPrimitiveSubregion(ClipToFilterRegion);
+    filterData->filter->setLastEffect(lastEffect);
 
     FilterData* data = filterData.get();
     // TODO(pdr): Can this be moved out of painter?
     m_filter.setFilterDataForLayoutObject(const_cast<LayoutObject*>(&object), filterData.release());
     return recordingContext.beginContent(data);
 }
 
 void SVGFilterPainter::finishEffect(const LayoutObject& object, SVGFilterRecordingContext& recordingContext)
 {
     FilterData* filterData = m_filter.getFilterDataForLayoutObject(&object);
@@ skipping 18 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);
 }
 
 }