Skip to content

GitLab

T
tangled
Commit 07ca63d5 authored by fs's avatar fs Committed by Commit bot
Browse files
Options

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}
parent ac73140e
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 31 deletions
third_party/WebKit/Source/core/svg/SVGFEBlendElement.cpp
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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
View file @ 07ca63d5
......@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment