Merge SVGFilter into Filter

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
@@ skipping 81 matching lines @@
     if (filterCached)
         m_filter.remove(client);
 
     // If the filter has a cached subtree, invalidate the associated display item.
     if (markForInvalidation && filterCached)
         markClientForInvalidation(client, PaintInvalidation);
 
     markClientForInvalidation(client, markForInvalidation ? BoundariesInvalidation : ParentOnlyInvalidation);
 }
 
-PassRefPtrWillBeRawPtr<SVGFilterBuilder> LayoutSVGResourceFilter::buildPrimitives(SVGFilter* filter)
+PassRefPtrWillBeRawPtr<SVGFilterBuilder> LayoutSVGResourceFilter::buildPrimitives(Filter* filter)
 {
     SVGFilterElement* filterElement = toSVGFilterElement(element());
     FloatRect referenceBox = filter->referenceBox();
 
     // Add effects to the builder
     RefPtrWillBeRawPtr<SVGFilterBuilder> builder = SVGFilterBuilder::create(filter->sourceGraphic());
     for (SVGElement* element = Traversal<SVGElement>::firstChild(*filterElement); element; element = Traversal<SVGElement>::nextSibling(*element)) {
         if (!element->isFilterEffect() || !element->layoutObject())
             continue;
 
@@ skipping 43 matching lines @@
             return;
         builder->clearResultsRecursive(effect);
 
         // Issue paint invalidations for the image on the screen.
         markClientForInvalidation(it->key, PaintInvalidation);
     }
     markAllClientLayersForInvalidation();
 }
 
 } // namespace blink