Clean up includes in SVGFE*Element and thereabouts

Drop inclusion of SVGParserUtilities.h in a number of places since it's
no longer used. Push FE*.h inclusion into the implementation where
possible, and don't include FilterEffect.h in those cases.
Also simplify a loop in SVGFEMergeElement::build.

Review-Url: https://codereview.chromium.org/2342353002
Cr-Commit-Position: refs/heads/master@{#419187}

third_party/WebKit/Source/core/svg/SVGFEBlendElement.cpp

@@ -23,7 +23,6 @@
 #include "core/SVGNames.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
 #include "platform/graphics/filters/FEBlend.h"
-#include "platform/graphics/filters/FilterEffect.h"
 
 namespace blink {
 

third_party/WebKit/Source/core/svg/SVGFEColorMatrixElement.cpp

@@ -22,7 +22,6 @@
 
 #include "core/SVGNames.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
-#include "platform/graphics/filters/FilterEffect.h"
 
 namespace blink {
 

third_party/WebKit/Source/core/svg/SVGFEComponentTransferElement.cpp

@@ -27,7 +27,7 @@
 #include "core/svg/SVGFEFuncGElement.h"
 #include "core/svg/SVGFEFuncRElement.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
-#include "platform/graphics/filters/FilterEffect.h"
+#include "platform/graphics/filters/FEComponentTransfer.h"
 
 namespace blink {
 

third_party/WebKit/Source/core/svg/SVGFEComponentTransferElement.h

@@ -22,7 +22,6 @@
 #define SVGFEComponentTransferElement_h
 
 #include "core/svg/SVGFilterPrimitiveStandardAttributes.h"
-#include "platform/graphics/filters/FEComponentTransfer.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {

third_party/WebKit/Source/core/svg/SVGFECompositeElement.cpp

@@ -22,7 +22,6 @@
 
 #include "core/SVGNames.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
-#include "platform/graphics/filters/FilterEffect.h"
 
 namespace blink {
 

third_party/WebKit/Source/core/svg/SVGFEConvolveMatrixElement.cpp

@@ -22,10 +22,8 @@
 #include "core/SVGNames.h"
 #include "core/dom/Document.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
-#include "platform/geometry/FloatPoint.h"
 #include "platform/geometry/IntPoint.h"
 #include "platform/geometry/IntSize.h"
-#include "platform/graphics/filters/FilterEffect.h"
 
 namespace blink {
 

third_party/WebKit/Source/core/svg/SVGFEDiffuseLightingElement.cpp

@@ -21,10 +21,9 @@
 
 #include "core/layout/LayoutObject.h"
 #include "core/style/ComputedStyle.h"
-#include "core/svg/SVGParserUtilities.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
 #include "platform/graphics/filters/FEDiffuseLighting.h"
-#include "platform/graphics/filters/FilterEffect.h"
+#include "platform/graphics/filters/Filter.h"
 
 namespace blink {
 

third_party/WebKit/Source/core/svg/SVGFEDisplacementMapElement.cpp

@@ -21,7 +21,6 @@
 
 #include "core/SVGNames.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
-#include "platform/graphics/filters/FilterEffect.h"
 
 namespace blink {
 

third_party/WebKit/Source/core/svg/SVGFEDropShadowElement.cpp

@@ -23,8 +23,8 @@
 #include "core/layout/LayoutObject.h"
 #include "core/style/ComputedStyle.h"
 #include "core/style/SVGComputedStyle.h"
-#include "core/svg/SVGParserUtilities.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
+#include "platform/graphics/filters/FEDropShadow.h"
 
 namespace blink {
 

third_party/WebKit/Source/core/svg/SVGFEDropShadowElement.h

@@ -23,7 +23,6 @@
 #include "core/svg/SVGAnimatedNumber.h"
 #include "core/svg/SVGAnimatedNumberOptionalNumber.h"
 #include "core/svg/SVGFilterPrimitiveStandardAttributes.h"
-#include "platform/graphics/filters/FEDropShadow.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {

third_party/WebKit/Source/core/svg/SVGFEFloodElement.cpp

@@ -24,6 +24,7 @@
 #include "core/layout/LayoutObject.h"
 #include "core/style/ComputedStyle.h"
 #include "core/style/SVGComputedStyle.h"
+#include "platform/graphics/filters/FEFlood.h"
 
 namespace blink {
 

third_party/WebKit/Source/core/svg/SVGFEFloodElement.h

@@ -22,7 +22,6 @@
 #define SVGFEFloodElement_h
 
 #include "core/svg/SVGFilterPrimitiveStandardAttributes.h"
-#include "platform/graphics/filters/FEFlood.h"
 
 namespace blink {
 

third_party/WebKit/Source/core/svg/SVGFEGaussianBlurElement.cpp

@@ -21,9 +21,8 @@
 #include "core/svg/SVGFEGaussianBlurElement.h"
 
 #include "core/SVGNames.h"
-#include "core/svg/SVGParserUtilities.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
-#include "platform/graphics/filters/FilterEffect.h"
+#include "platform/graphics/filters/FEGaussianBlur.h"
 
 namespace blink {
 

third_party/WebKit/Source/core/svg/SVGFEGaussianBlurElement.h

@@ -23,7 +23,6 @@
 
 #include "core/svg/SVGAnimatedNumberOptionalNumber.h"
 #include "core/svg/SVGFilterPrimitiveStandardAttributes.h"
-#include "platform/graphics/filters/FEGaussianBlur.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {

third_party/WebKit/Source/core/svg/SVGFEMergeElement.cpp

@@ -24,7 +24,7 @@
 #include "core/dom/ElementTraversal.h"
 #include "core/svg/SVGFEMergeNodeElement.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
-#include "platform/graphics/filters/FilterEffect.h"
+#include "platform/graphics/filters/FEMerge.h"
 
 namespace blink {
 
@@ -39,8 +39,8 @@ FilterEffect* SVGFEMergeElement::build(SVGFilterBuilder* filterBuilder, Filter*
 {
     FilterEffect* effect = FEMerge::create(filter);
     FilterEffectVector& mergeInputs = effect->inputEffects();
-    for (SVGFEMergeNodeElement* element = Traversal<SVGFEMergeNodeElement>::firstChild(*this); element; element = Traversal<SVGFEMergeNodeElement>::nextSibling(*element)) {
-        FilterEffect* mergeEffect = filterBuilder->getEffectById(AtomicString(element->in1()->currentValue()->value()));
+    for (SVGFEMergeNodeElement& mergeNode : Traversal<SVGFEMergeNodeElement>::childrenOf(*this)) {
+        FilterEffect* mergeEffect = filterBuilder->getEffectById(AtomicString(mergeNode.in1()->currentValue()->value()));
         ASSERT(mergeEffect);
         mergeInputs.append(mergeEffect);
     }

third_party/WebKit/Source/core/svg/SVGFEMergeElement.h

@@ -22,7 +22,6 @@
 #define SVGFEMergeElement_h
 
 #include "core/svg/SVGFilterPrimitiveStandardAttributes.h"
-#include "platform/graphics/filters/FEMerge.h"
 
 namespace blink {
 

third_party/WebKit/Source/core/svg/SVGFEMorphologyElement.cpp

@@ -20,9 +20,7 @@
 #include "core/svg/SVGFEMorphologyElement.h"
 
 #include "core/SVGNames.h"
-#include "core/svg/SVGParserUtilities.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
-#include "platform/graphics/filters/FilterEffect.h"
 
 namespace blink {
 

third_party/WebKit/Source/core/svg/SVGFEOffsetElement.cpp

@@ -22,7 +22,7 @@
 
 #include "core/SVGNames.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
-#include "platform/graphics/filters/FilterEffect.h"
+#include "platform/graphics/filters/FEOffset.h"
 
 namespace blink {
 

third_party/WebKit/Source/core/svg/SVGFEOffsetElement.h

@@ -23,7 +23,6 @@
 
 #include "core/svg/SVGAnimatedNumber.h"
 #include "core/svg/SVGFilterPrimitiveStandardAttributes.h"
-#include "platform/graphics/filters/FEOffset.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {

third_party/WebKit/Source/core/svg/SVGFESpecularLightingElement.cpp

@@ -23,9 +23,9 @@
 
 #include "core/layout/LayoutObject.h"
 #include "core/style/ComputedStyle.h"
-#include "core/svg/SVGParserUtilities.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
-#include "platform/graphics/filters/FilterEffect.h"
+#include "platform/graphics/filters/FESpecularLighting.h"
+#include "platform/graphics/filters/Filter.h"
 
 namespace blink {
 

third_party/WebKit/Source/core/svg/SVGFESpecularLightingElement.h

@@ -27,7 +27,6 @@
 #include "core/svg/SVGAnimatedNumberOptionalNumber.h"
 #include "core/svg/SVGFELightElement.h"
 #include "core/svg/SVGFilterPrimitiveStandardAttributes.h"
-#include "platform/graphics/filters/FESpecularLighting.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {

third_party/WebKit/Source/core/svg/SVGFETileElement.cpp

@@ -22,7 +22,7 @@
 
 #include "core/SVGNames.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
-#include "platform/graphics/filters/FilterEffect.h"
+#include "platform/graphics/filters/FETile.h"
 
 namespace blink {
 

third_party/WebKit/Source/core/svg/SVGFETileElement.h

@@ -22,7 +22,6 @@
 #define SVGFETileElement_h
 
 #include "core/svg/SVGFilterPrimitiveStandardAttributes.h"
-#include "platform/graphics/filters/FETile.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {

third_party/WebKit/Source/core/svg/SVGFETurbulenceElement.cpp

@@ -21,7 +21,6 @@
 #include "core/svg/SVGFETurbulenceElement.h"
 
 #include "core/SVGNames.h"
-#include "core/svg/SVGParserUtilities.h"
 
 namespace blink {
 

third_party/WebKit/Source/core/svg/SVGFilterElement.cpp

@@ -25,7 +25,6 @@
 
 #include "core/frame/UseCounter.h"
 #include "core/layout/svg/LayoutSVGResourceFilter.h"
-#include "core/svg/SVGParserUtilities.h"
 #include "core/svg/SVGResourceClient.h"
 
 namespace blink {