summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/svg
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-05-13 16:23:25 +0100
committerBen Murdoch <benm@google.com>2011-05-16 11:35:02 +0100
commit65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch)
treef478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/svg
parent47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff)
downloadexternal_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip
external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz
external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/svg')
-rw-r--r--Source/WebCore/svg/SVGElement.cpp1
-rw-r--r--Source/WebCore/svg/SVGElement.h2
-rw-r--r--Source/WebCore/svg/SVGFEBlendElement.cpp2
-rw-r--r--Source/WebCore/svg/SVGFEColorMatrixElement.cpp2
-rw-r--r--Source/WebCore/svg/SVGFEComponentTransferElement.cpp2
-rw-r--r--Source/WebCore/svg/SVGFECompositeElement.cpp2
-rw-r--r--Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp2
-rw-r--r--Source/WebCore/svg/SVGFEConvolveMatrixElement.h2
-rw-r--r--Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp2
-rw-r--r--Source/WebCore/svg/SVGFEDisplacementMapElement.cpp2
-rw-r--r--Source/WebCore/svg/SVGFEGaussianBlurElement.cpp2
-rw-r--r--Source/WebCore/svg/SVGFEImageElement.h1
-rw-r--r--Source/WebCore/svg/SVGFEMergeElement.cpp2
-rw-r--r--Source/WebCore/svg/SVGFEMorphologyElement.cpp2
-rw-r--r--Source/WebCore/svg/SVGFEOffsetElement.cpp2
-rw-r--r--Source/WebCore/svg/SVGFESpecularLightingElement.cpp2
-rw-r--r--Source/WebCore/svg/SVGFETileElement.cpp2
-rw-r--r--Source/WebCore/svg/SVGFETurbulenceElement.h1
-rw-r--r--Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp1
-rw-r--r--Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h8
-rw-r--r--Source/WebCore/svg/SVGForeignObjectElement.cpp4
-rw-r--r--Source/WebCore/svg/SVGTextContentElement.cpp1
-rw-r--r--Source/WebCore/svg/graphics/filters/SVGFEImage.cpp2
-rw-r--r--Source/WebCore/svg/graphics/filters/SVGFEImage.h2
24 files changed, 45 insertions, 6 deletions
diff --git a/Source/WebCore/svg/SVGElement.cpp b/Source/WebCore/svg/SVGElement.cpp
index 1f5b0fa..c9efae8 100644
--- a/Source/WebCore/svg/SVGElement.cpp
+++ b/Source/WebCore/svg/SVGElement.cpp
@@ -38,6 +38,7 @@
#include "RegisteredEventListener.h"
#include "RenderObject.h"
#include "SVGCursorElement.h"
+#include "SVGDocumentExtensions.h"
#include "SVGElementInstance.h"
#include "SVGElementRareData.h"
#include "SVGNames.h"
diff --git a/Source/WebCore/svg/SVGElement.h b/Source/WebCore/svg/SVGElement.h
index d961c73..2c87f6e 100644
--- a/Source/WebCore/svg/SVGElement.h
+++ b/Source/WebCore/svg/SVGElement.h
@@ -23,7 +23,6 @@
#define SVGElement_h
#if ENABLE(SVG)
-#include "SVGDocumentExtensions.h"
#include "SVGLocatable.h"
#include "StyledElement.h"
@@ -32,6 +31,7 @@ namespace WebCore {
class CSSCursorImageValue;
class Document;
class SVGCursorElement;
+class SVGDocumentExtensions;
class SVGElementInstance;
class SVGElementRareData;
class SVGSVGElement;
diff --git a/Source/WebCore/svg/SVGFEBlendElement.cpp b/Source/WebCore/svg/SVGFEBlendElement.cpp
index 86299fe..4128232 100644
--- a/Source/WebCore/svg/SVGFEBlendElement.cpp
+++ b/Source/WebCore/svg/SVGFEBlendElement.cpp
@@ -24,6 +24,8 @@
#include "SVGFEBlendElement.h"
#include "Attribute.h"
+#include "FilterEffect.h"
+#include "SVGFilterBuilder.h"
#include "SVGNames.h"
namespace WebCore {
diff --git a/Source/WebCore/svg/SVGFEColorMatrixElement.cpp b/Source/WebCore/svg/SVGFEColorMatrixElement.cpp
index 79716fb..4c7ac0b 100644
--- a/Source/WebCore/svg/SVGFEColorMatrixElement.cpp
+++ b/Source/WebCore/svg/SVGFEColorMatrixElement.cpp
@@ -24,6 +24,8 @@
#include "SVGFEColorMatrixElement.h"
#include "Attribute.h"
+#include "FilterEffect.h"
+#include "SVGFilterBuilder.h"
#include "SVGNames.h"
namespace WebCore {
diff --git a/Source/WebCore/svg/SVGFEComponentTransferElement.cpp b/Source/WebCore/svg/SVGFEComponentTransferElement.cpp
index 0fa98a4..243f856 100644
--- a/Source/WebCore/svg/SVGFEComponentTransferElement.cpp
+++ b/Source/WebCore/svg/SVGFEComponentTransferElement.cpp
@@ -24,10 +24,12 @@
#include "SVGFEComponentTransferElement.h"
#include "Attr.h"
+#include "FilterEffect.h"
#include "SVGFEFuncAElement.h"
#include "SVGFEFuncBElement.h"
#include "SVGFEFuncGElement.h"
#include "SVGFEFuncRElement.h"
+#include "SVGFilterBuilder.h"
#include "SVGNames.h"
namespace WebCore {
diff --git a/Source/WebCore/svg/SVGFECompositeElement.cpp b/Source/WebCore/svg/SVGFECompositeElement.cpp
index 1433a78..4c83d4f 100644
--- a/Source/WebCore/svg/SVGFECompositeElement.cpp
+++ b/Source/WebCore/svg/SVGFECompositeElement.cpp
@@ -24,6 +24,8 @@
#include "SVGFECompositeElement.h"
#include "Attribute.h"
+#include "FilterEffect.h"
+#include "SVGFilterBuilder.h"
#include "SVGNames.h"
namespace WebCore {
diff --git a/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp b/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp
index 373d508..301e351 100644
--- a/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp
+++ b/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp
@@ -23,9 +23,11 @@
#include "SVGFEConvolveMatrixElement.h"
#include "Attr.h"
+#include "FilterEffect.h"
#include "FloatPoint.h"
#include "IntPoint.h"
#include "IntSize.h"
+#include "SVGFilterBuilder.h"
#include "SVGNames.h"
#include "SVGParserUtilities.h"
diff --git a/Source/WebCore/svg/SVGFEConvolveMatrixElement.h b/Source/WebCore/svg/SVGFEConvolveMatrixElement.h
index 21826ec..87709ab 100644
--- a/Source/WebCore/svg/SVGFEConvolveMatrixElement.h
+++ b/Source/WebCore/svg/SVGFEConvolveMatrixElement.h
@@ -22,7 +22,9 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FEConvolveMatrix.h"
+#include "SVGAnimatedBoolean.h"
#include "SVGAnimatedEnumeration.h"
+#include "SVGAnimatedInteger.h"
#include "SVGAnimatedNumber.h"
#include "SVGAnimatedNumberList.h"
#include "SVGFilterPrimitiveStandardAttributes.h"
diff --git a/Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp b/Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp
index 873b831..49888da 100644
--- a/Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp
+++ b/Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp
@@ -24,9 +24,11 @@
#include "Attr.h"
#include "FEDiffuseLighting.h"
+#include "FilterEffect.h"
#include "RenderStyle.h"
#include "SVGColor.h"
#include "SVGFELightElement.h"
+#include "SVGFilterBuilder.h"
#include "SVGNames.h"
#include "SVGParserUtilities.h"
diff --git a/Source/WebCore/svg/SVGFEDisplacementMapElement.cpp b/Source/WebCore/svg/SVGFEDisplacementMapElement.cpp
index a363b3a..56315b6 100644
--- a/Source/WebCore/svg/SVGFEDisplacementMapElement.cpp
+++ b/Source/WebCore/svg/SVGFEDisplacementMapElement.cpp
@@ -23,6 +23,8 @@
#include "SVGFEDisplacementMapElement.h"
#include "Attribute.h"
+#include "FilterEffect.h"
+#include "SVGFilterBuilder.h"
#include "SVGNames.h"
namespace WebCore {
diff --git a/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp b/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp
index 43b6fd6..03368ac 100644
--- a/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp
+++ b/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp
@@ -24,6 +24,8 @@
#include "SVGFEGaussianBlurElement.h"
#include "Attribute.h"
+#include "FilterEffect.h"
+#include "SVGFilterBuilder.h"
#include "SVGNames.h"
#include "SVGParserUtilities.h"
diff --git a/Source/WebCore/svg/SVGFEImageElement.h b/Source/WebCore/svg/SVGFEImageElement.h
index 64d95dc..3f22805 100644
--- a/Source/WebCore/svg/SVGFEImageElement.h
+++ b/Source/WebCore/svg/SVGFEImageElement.h
@@ -25,6 +25,7 @@
#include "CachedResourceClient.h"
#include "CachedResourceHandle.h"
#include "ImageBuffer.h"
+#include "SVGAnimatedBoolean.h"
#include "SVGAnimatedPreserveAspectRatio.h"
#include "SVGExternalResourcesRequired.h"
#include "SVGFEImage.h"
diff --git a/Source/WebCore/svg/SVGFEMergeElement.cpp b/Source/WebCore/svg/SVGFEMergeElement.cpp
index 92f2346..8b1c753 100644
--- a/Source/WebCore/svg/SVGFEMergeElement.cpp
+++ b/Source/WebCore/svg/SVGFEMergeElement.cpp
@@ -23,7 +23,9 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEMergeElement.h"
+#include "FilterEffect.h"
#include "SVGFEMergeNodeElement.h"
+#include "SVGFilterBuilder.h"
#include "SVGNames.h"
namespace WebCore {
diff --git a/Source/WebCore/svg/SVGFEMorphologyElement.cpp b/Source/WebCore/svg/SVGFEMorphologyElement.cpp
index 282c495..caf8e7b 100644
--- a/Source/WebCore/svg/SVGFEMorphologyElement.cpp
+++ b/Source/WebCore/svg/SVGFEMorphologyElement.cpp
@@ -23,6 +23,8 @@
#include "SVGFEMorphologyElement.h"
#include "Attribute.h"
+#include "FilterEffect.h"
+#include "SVGFilterBuilder.h"
#include "SVGNames.h"
#include "SVGParserUtilities.h"
diff --git a/Source/WebCore/svg/SVGFEOffsetElement.cpp b/Source/WebCore/svg/SVGFEOffsetElement.cpp
index d41e6db..2bd8aee 100644
--- a/Source/WebCore/svg/SVGFEOffsetElement.cpp
+++ b/Source/WebCore/svg/SVGFEOffsetElement.cpp
@@ -24,6 +24,8 @@
#include "SVGFEOffsetElement.h"
#include "Attribute.h"
+#include "FilterEffect.h"
+#include "SVGFilterBuilder.h"
#include "SVGNames.h"
namespace WebCore {
diff --git a/Source/WebCore/svg/SVGFESpecularLightingElement.cpp b/Source/WebCore/svg/SVGFESpecularLightingElement.cpp
index 806d0cd..9298b3c 100644
--- a/Source/WebCore/svg/SVGFESpecularLightingElement.cpp
+++ b/Source/WebCore/svg/SVGFESpecularLightingElement.cpp
@@ -25,9 +25,11 @@
#include "SVGFESpecularLightingElement.h"
#include "Attribute.h"
+#include "FilterEffect.h"
#include "RenderStyle.h"
#include "SVGColor.h"
#include "SVGFELightElement.h"
+#include "SVGFilterBuilder.h"
#include "SVGNames.h"
#include "SVGParserUtilities.h"
diff --git a/Source/WebCore/svg/SVGFETileElement.cpp b/Source/WebCore/svg/SVGFETileElement.cpp
index e981482..6fc19e6 100644
--- a/Source/WebCore/svg/SVGFETileElement.cpp
+++ b/Source/WebCore/svg/SVGFETileElement.cpp
@@ -24,6 +24,8 @@
#include "SVGFETileElement.h"
#include "Attribute.h"
+#include "FilterEffect.h"
+#include "SVGFilterBuilder.h"
#include "SVGNames.h"
#include "SVGRenderStyle.h"
diff --git a/Source/WebCore/svg/SVGFETurbulenceElement.h b/Source/WebCore/svg/SVGFETurbulenceElement.h
index 5e436f4..f9d86cb 100644
--- a/Source/WebCore/svg/SVGFETurbulenceElement.h
+++ b/Source/WebCore/svg/SVGFETurbulenceElement.h
@@ -24,6 +24,7 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FETurbulence.h"
#include "SVGAnimatedEnumeration.h"
+#include "SVGAnimatedInteger.h"
#include "SVGAnimatedNumber.h"
#include "SVGFilterPrimitiveStandardAttributes.h"
diff --git a/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp b/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp
index bd717ea..00f99c5 100644
--- a/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp
+++ b/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp
@@ -27,6 +27,7 @@
#include "Attribute.h"
#include "FilterEffect.h"
#include "RenderSVGResourceFilterPrimitive.h"
+#include "SVGFilterBuilder.h"
#include "SVGLength.h"
#include "SVGNames.h"
#include "SVGStyledElement.h"
diff --git a/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h b/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h
index b13084b..34e19ea 100644
--- a/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h
+++ b/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h
@@ -22,11 +22,9 @@
#define SVGFilterPrimitiveStandardAttributes_h
#if ENABLE(SVG) && ENABLE(FILTERS)
-#include "FilterEffect.h"
#include "RenderSVGResource.h"
#include "SVGAnimatedLength.h"
-#include "SVGFilterBuilder.h"
-#include "SVGFilterElement.h"
+#include "SVGAnimatedString.h"
#include "SVGStyledElement.h"
#include <wtf/PassRefPtr.h>
@@ -34,6 +32,10 @@
namespace WebCore {
+class Filter;
+class FilterEffect;
+class SVGFilterBuilder;
+
class SVGFilterPrimitiveStandardAttributes : public SVGStyledElement {
public:
void setStandardAttributes(bool, FilterEffect*) const;
diff --git a/Source/WebCore/svg/SVGForeignObjectElement.cpp b/Source/WebCore/svg/SVGForeignObjectElement.cpp
index c2fcecb..6b5cd41 100644
--- a/Source/WebCore/svg/SVGForeignObjectElement.cpp
+++ b/Source/WebCore/svg/SVGForeignObjectElement.cpp
@@ -25,7 +25,7 @@
#include "Attribute.h"
#include "CSSPropertyNames.h"
-#include "RenderForeignObject.h"
+#include "RenderSVGForeignObject.h"
#include "RenderSVGResource.h"
#include "SVGLength.h"
#include "SVGNames.h"
@@ -139,7 +139,7 @@ void SVGForeignObjectElement::synchronizeProperty(const QualifiedName& attrName)
RenderObject* SVGForeignObjectElement::createRenderer(RenderArena* arena, RenderStyle*)
{
- return new (arena) RenderForeignObject(this);
+ return new (arena) RenderSVGForeignObject(this);
}
bool SVGForeignObjectElement::childShouldCreateRenderer(Node* child) const
diff --git a/Source/WebCore/svg/SVGTextContentElement.cpp b/Source/WebCore/svg/SVGTextContentElement.cpp
index de75f5b..f723ecc 100644
--- a/Source/WebCore/svg/SVGTextContentElement.cpp
+++ b/Source/WebCore/svg/SVGTextContentElement.cpp
@@ -27,6 +27,7 @@
#include "CSSValueKeywords.h"
#include "Frame.h"
#include "RenderObject.h"
+#include "SVGDocumentExtensions.h"
#include "SVGNames.h"
#include "SVGTextQuery.h"
#include "SelectionController.h"
diff --git a/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp b/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp
index 6ed305e..d6d6f99 100644
--- a/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp
+++ b/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp
@@ -28,7 +28,9 @@
#include "AffineTransform.h"
#include "Filter.h"
#include "GraphicsContext.h"
+#include "RenderTreeAsText.h"
#include "SVGPreserveAspectRatio.h"
+#include "TextStream.h"
namespace WebCore {
diff --git a/Source/WebCore/svg/graphics/filters/SVGFEImage.h b/Source/WebCore/svg/graphics/filters/SVGFEImage.h
index 9ac5527..a5383cc 100644
--- a/Source/WebCore/svg/graphics/filters/SVGFEImage.h
+++ b/Source/WebCore/svg/graphics/filters/SVGFEImage.h
@@ -29,6 +29,8 @@
namespace WebCore {
+class Image;
+
class FEImage : public FilterEffect {
public:
static PassRefPtr<FEImage> create(Filter*, RefPtr<Image>, const SVGPreserveAspectRatio&);