Replace FilterData::boundaries with Filter::filterRegion()

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/PaintInfo.h"
 #include "core/layout/svg/LayoutSVGResourceFilter.h"
 #include "core/paint/CompositingRecorder.h"
@@ skipping 11 matching lines @@
 {
     ASSERT(filterData->m_state == FilterData::Initial);
 
     // For slimming paint we need to create a new context so the contents of the
     // filter can be drawn and cached.
     if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
         filterData->m_displayItemList = DisplayItemList::create();
         filterData->m_context = adoptPtr(new GraphicsContext(filterData->m_displayItemList.get()));
         context = filterData->m_context.get();
     } else {
-        context->beginRecording(filterData->boundaries);
+        context->beginRecording(filterData->filter->filterRegion());
     }
 
     filterData->m_state = FilterData::RecordingContent;
     return context;
 }
 
 static void endRecordingContent(GraphicsContext* context, FilterData* filterData)
 {
     ASSERT(filterData->m_state == FilterData::RecordingContent);
 
     // FIXME: maybe filterData should just hold onto SourceGraphic after creation?
     SourceGraphic* sourceGraphic = static_cast<SourceGraphic*>(filterData->builder->getEffectById(SourceGraphic::effectName()));
     ASSERT(sourceGraphic);
 
     // For slimming paint we need to use the context that contains the filtered
     // content.
     if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
         ASSERT(filterData->m_displayItemList);
         ASSERT(filterData->m_context);
         context = filterData->m_context.get();
-        context->beginRecording(filterData->boundaries);
+        context->beginRecording(filterData->filter->filterRegion());
         filterData->m_displayItemList->commitNewDisplayItemsAndReplay(*context);
     }
 
     sourceGraphic->setPicture(context->endRecording());
 
     // Content is cached by the source graphic so temporaries can be freed.
     if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
         filterData->m_displayItemList = nullptr;
         filterData->m_context = nullptr;
     }
 
     filterData->m_state = FilterData::ReadyToPaint;
 }
 
 static void paintFilteredContent(GraphicsContext* context, FilterData* filterData, SVGFilterElement* filterElement)
 {
     ASSERT(filterData->m_state == FilterData::ReadyToPaint);
     filterData->m_state = FilterData::PaintingFilter;
 
     SkiaImageFilterBuilder builder(context);
     SourceGraphic* sourceGraphic = static_cast<SourceGraphic*>(filterData->builder->getEffectById(SourceGraphic::effectName()));
     ASSERT(sourceGraphic);
     builder.setSourceGraphic(sourceGraphic);
     RefPtr<SkImageFilter> imageFilter = builder.build(filterData->builder->lastEffect(), ColorSpaceDeviceRGB);
-    FloatRect boundaries = filterData->boundaries;
+    FloatRect boundaries = filterData->filter->filterRegion();
     context->save();
 
     // Clip drawing of filtered image to the minimum required paint rect.
     FilterEffect* lastEffect = filterData->builder->lastEffect();
     context->clipRect(lastEffect->determineAbsolutePaintRect(lastEffect->maxEffectRect()));
     if (filterElement->hasAttribute(SVGNames::filterResAttr)) {
         // Get boundaries in device coords.
         // FIXME: See crbug.com/382491. Is the use of getCTM OK here, given it does not include device
         // zoom or High DPI adjustments?
         FloatSize size = context->getCTM().mapSize(boundaries.size());
@@ skipping 48 matching lines @@
         if (filterData->m_state == FilterData::RecordingContent)
             filterData->m_state = FilterData::RecordingContentCycleDetected;
 
         return nullptr;
     }
 
     OwnPtrWillBeRawPtr<FilterData> filterData = FilterData::create();
     FloatRect targetBoundingBox = object.objectBoundingBox();
 
     SVGFilterElement* filterElement = toSVGFilterElement(m_filter.element());
-    filterData->boundaries = SVGLengthContext::resolveRectangle<SVGFilterElement>(filterElement, filterElement->filterUnits()->currentValue()->enumValue(), targetBoundingBox);
-    if (filterData->boundaries.isEmpty())
+    FloatRect filterRegion = SVGLengthContext::resolveRectangle<SVGFilterElement>(filterElement, filterElement->filterUnits()->currentValue()->enumValue(), targetBoundingBox);
+    if (filterRegion.isEmpty())
         return nullptr;
 
     // Create the SVGFilter object.
     FloatRect drawingRegion = object.strokeBoundingBox();
-    drawingRegion.intersect(filterData->boundaries);
+    drawingRegion.intersect(filterRegion);
     bool primitiveBoundingBoxMode = filterElement->primitiveUnits()->currentValue()->enumValue() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX;
-    filterData->filter = SVGFilter::create(enclosingIntRect(drawingRegion), targetBoundingBox, filterData->boundaries, primitiveBoundingBoxMode);
+    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();
     if (!lastEffect)
         return nullptr;
 
@@ skipping 24 matching lines @@
 
     LayoutObjectDrawingRecorder recorder(*context, object, DisplayItem::SVGFilter, LayoutRect::infiniteIntRect());
     if (recorder.canUseCachedDrawing())
         return;
 
     if (filterData && filterData->m_state == FilterData::ReadyToPaint)
         paintFilteredContent(context, filterData, toSVGFilterElement(m_filter.element()));
 }
 
 }