Replace FilterData::filter with lastEffect

third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceFilter.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
  * Copyright (C) 2005 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "core/layout/svg/LayoutSVGResourceFilter.h"
 
+#include "core/svg/SVGFilterElement.h"
 #include "core/svg/SVGFilterPrimitiveStandardAttributes.h"
+#include "core/svg/graphics/filters/SVGFilterBuilder.h"
 
 namespace blink {
 
 DEFINE_TRACE(FilterData)
 {
-    visitor->trace(filter);
+    visitor->trace(lastEffect);
     visitor->trace(nodeMap);
 }
 
 void FilterData::dispose()
 {
     nodeMap = nullptr;
-    filter = nullptr;
+    lastEffect = nullptr;
 }
 
 LayoutSVGResourceFilter::LayoutSVGResourceFilter(SVGFilterElement* node)
     : LayoutSVGResourceContainer(node)
 {
 }
 
 LayoutSVGResourceFilter::~LayoutSVGResourceFilter()
 {
 }
@@ skipping 41 matching lines @@
 }
 
 FloatRect LayoutSVGResourceFilter::resourceBoundingBox(const LayoutObject* object)
 {
     if (SVGFilterElement* element = toSVGFilterElement(this->element()))
         return SVGLengthContext::resolveRectangle<SVGFilterElement>(element, element->filterUnits()->currentValue()->enumValue(), object->objectBoundingBox());
 
     return FloatRect();
 }
 
+SVGUnitTypes::SVGUnitType LayoutSVGResourceFilter::filterUnits() const
+{
+    return toSVGFilterElement(element())->filterUnits()->currentValue()->enumValue();
+}
+
+SVGUnitTypes::SVGUnitType LayoutSVGResourceFilter::primitiveUnits() const
+{
+    return toSVGFilterElement(element())->primitiveUnits()->currentValue()->enumValue();
+}
+
 void LayoutSVGResourceFilter::primitiveAttributeChanged(LayoutObject* object, const QualifiedName& attribute)
 {
     SVGFilterPrimitiveStandardAttributes* primitive = static_cast<SVGFilterPrimitiveStandardAttributes*>(object->node());
 
     for (auto& filter : m_filter) {
         FilterData* filterData = filter.value.get();
         if (filterData->m_state != FilterData::ReadyToPaint)
             continue;
 
         SVGFilterGraphNodeMap* nodeMap = filterData->nodeMap.get();
         FilterEffect* effect = nodeMap->effectByRenderer(object);
         if (!effect)
             continue;
         // Since all effects shares the same attribute value, all
         // or none of them will be changed.
         if (!primitive->setFilterEffectAttribute(effect, attribute))
             return;
         nodeMap->invalidateDependentEffects(effect);
 
         // Issue paint invalidations for the image on the screen.
         markClientForInvalidation(filter.key, PaintInvalidation);
     }
     markAllResourceClientsForInvalidation();
 }
 
 } // namespace blink