diff options
Diffstat (limited to 'src/3rdparty/webkit/WebCore/svg')
57 files changed, 89 insertions, 152 deletions
diff --git a/src/3rdparty/webkit/WebCore/svg/GradientAttributes.h b/src/3rdparty/webkit/WebCore/svg/GradientAttributes.h index 2d7c32a..6b3408e 100644 --- a/src/3rdparty/webkit/WebCore/svg/GradientAttributes.h +++ b/src/3rdparty/webkit/WebCore/svg/GradientAttributes.h @@ -24,8 +24,7 @@ #if ENABLE(SVG) -namespace WebCore -{ +namespace WebCore { struct GradientAttributes { GradientAttributes() : m_spreadMethod(SpreadMethodPad) diff --git a/src/3rdparty/webkit/WebCore/svg/LinearGradientAttributes.h b/src/3rdparty/webkit/WebCore/svg/LinearGradientAttributes.h index e640c03..fc59465 100644 --- a/src/3rdparty/webkit/WebCore/svg/LinearGradientAttributes.h +++ b/src/3rdparty/webkit/WebCore/svg/LinearGradientAttributes.h @@ -26,8 +26,7 @@ #if ENABLE(SVG) -namespace WebCore -{ +namespace WebCore { struct LinearGradientAttributes : GradientAttributes { LinearGradientAttributes() : m_x1(0.0) diff --git a/src/3rdparty/webkit/WebCore/svg/PatternAttributes.h b/src/3rdparty/webkit/WebCore/svg/PatternAttributes.h index 2940baf..b43d87e 100644 --- a/src/3rdparty/webkit/WebCore/svg/PatternAttributes.h +++ b/src/3rdparty/webkit/WebCore/svg/PatternAttributes.h @@ -24,8 +24,7 @@ #if ENABLE(SVG) -namespace WebCore -{ +namespace WebCore { struct PatternAttributes { PatternAttributes() : m_x() diff --git a/src/3rdparty/webkit/WebCore/svg/RadialGradientAttributes.h b/src/3rdparty/webkit/WebCore/svg/RadialGradientAttributes.h index 782ab49..273cd29 100644 --- a/src/3rdparty/webkit/WebCore/svg/RadialGradientAttributes.h +++ b/src/3rdparty/webkit/WebCore/svg/RadialGradientAttributes.h @@ -26,8 +26,7 @@ #if ENABLE(SVG) -namespace WebCore -{ +namespace WebCore { struct RadialGradientAttributes : GradientAttributes { RadialGradientAttributes() : m_cx(0.5) diff --git a/src/3rdparty/webkit/WebCore/svg/SVGAnimatedPathData.h b/src/3rdparty/webkit/WebCore/svg/SVGAnimatedPathData.h index 6b3faf6..88b994b 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGAnimatedPathData.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGAnimatedPathData.h @@ -25,12 +25,10 @@ #if ENABLE(SVG) -namespace WebCore -{ +namespace WebCore { class SVGPathSegList; - class SVGAnimatedPathData - { + class SVGAnimatedPathData { public: SVGAnimatedPathData(); virtual ~SVGAnimatedPathData(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGAnimatedPoints.h b/src/3rdparty/webkit/WebCore/svg/SVGAnimatedPoints.h index 58323c0..1e61057 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGAnimatedPoints.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGAnimatedPoints.h @@ -25,12 +25,10 @@ #if ENABLE(SVG) -namespace WebCore -{ +namespace WebCore { class SVGPointList; - class SVGAnimatedPoints - { + class SVGAnimatedPoints { public: SVGAnimatedPoints(); virtual ~SVGAnimatedPoints(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGAnimationElement.h b/src/3rdparty/webkit/WebCore/svg/SVGAnimationElement.h index 120beb4..d43ed57 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGAnimationElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGAnimationElement.h @@ -43,8 +43,7 @@ namespace WebCore { class SVGAnimationElement : public SVGSMILElement, public SVGTests, public SVGExternalResourcesRequired, - public ElementTimeControl - { + public ElementTimeControl { public: SVGAnimationElement(const QualifiedName&, Document*); virtual ~SVGAnimationElement(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGClipPathElement.h b/src/3rdparty/webkit/WebCore/svg/SVGClipPathElement.h index ab7ea68..4043554 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGClipPathElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGClipPathElement.h @@ -35,8 +35,7 @@ namespace WebCore { class SVGClipPathElement : public SVGStyledTransformableElement, public SVGTests, public SVGLangSpace, - public SVGExternalResourcesRequired - { + public SVGExternalResourcesRequired { public: SVGClipPathElement(const QualifiedName&, Document*); virtual ~SVGClipPathElement(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGDocumentExtensions.cpp b/src/3rdparty/webkit/WebCore/svg/SVGDocumentExtensions.cpp index d7169e1..61645f4 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGDocumentExtensions.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGDocumentExtensions.cpp @@ -89,13 +89,13 @@ void SVGDocumentExtensions::unpauseAnimations() void SVGDocumentExtensions::reportWarning(const String& message) { if (Frame* frame = m_doc->frame()) - frame->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, "Warning: " + message, m_doc->tokenizer() ? m_doc->tokenizer()->lineNumber() : 1, String()); + frame->domWindow()->console()->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, "Warning: " + message, m_doc->tokenizer() ? m_doc->tokenizer()->lineNumber() : 1, String()); } void SVGDocumentExtensions::reportError(const String& message) { if (Frame* frame = m_doc->frame()) - frame->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, "Error: " + message, m_doc->tokenizer() ? m_doc->tokenizer()->lineNumber() : 1, String()); + frame->domWindow()->console()->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, "Error: " + message, m_doc->tokenizer() ? m_doc->tokenizer()->lineNumber() : 1, String()); } void SVGDocumentExtensions::addPendingResource(const AtomicString& id, SVGStyledElement* obj) diff --git a/src/3rdparty/webkit/WebCore/svg/SVGElementInstance.h b/src/3rdparty/webkit/WebCore/svg/SVGElementInstance.h index 7c56792..c477718 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGElementInstance.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGElementInstance.h @@ -44,8 +44,7 @@ namespace WebCore { // SVGElementInstance mimics Node, but without providing all its functionality class SVGElementInstance : public TreeShared<SVGElementInstance>, - public EventTarget - { + public EventTarget { public: SVGElementInstance(SVGUseElement*, SVGElement* originalElement); virtual ~SVGElementInstance(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGElementInstance.idl b/src/3rdparty/webkit/WebCore/svg/SVGElementInstance.idl index 3d88178..cd4213c 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGElementInstance.idl +++ b/src/3rdparty/webkit/WebCore/svg/SVGElementInstance.idl @@ -31,7 +31,7 @@ module svg { CustomListeners, CustomMarkFunction, CustomPushEventHandlerScope, - GenerateToJS, + CustomToJS, GenerateNativeConverter ] SVGElementInstance #if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFEBlendElement.cpp b/src/3rdparty/webkit/WebCore/svg/SVGFEBlendElement.cpp index f78412c..0497ea9 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFEBlendElement.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGFEBlendElement.cpp @@ -69,7 +69,7 @@ bool SVGFEBlendElement::build(SVGResourceFilter* filterResource) FilterEffect* input1 = filterResource->builder()->getEffectById(in1()); FilterEffect* input2 = filterResource->builder()->getEffectById(in2()); - if(!input1 || !input2) + if (!input1 || !input2) return false; RefPtr<FilterEffect> effect = FEBlend::create(input1, input2, static_cast<BlendModeType>(mode())); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFEBlendElement.h b/src/3rdparty/webkit/WebCore/svg/SVGFEBlendElement.h index 70e5e06..bed649f 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFEBlendElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGFEBlendElement.h @@ -27,10 +27,8 @@ #include "FEBlend.h" #include "SVGFilterPrimitiveStandardAttributes.h" -namespace WebCore -{ - class SVGFEBlendElement : public SVGFilterPrimitiveStandardAttributes - { +namespace WebCore { + class SVGFEBlendElement : public SVGFilterPrimitiveStandardAttributes { public: SVGFEBlendElement(const QualifiedName&, Document*); virtual ~SVGFEBlendElement(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFEColorMatrixElement.cpp b/src/3rdparty/webkit/WebCore/svg/SVGFEColorMatrixElement.cpp index 660f000..c2d605b 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFEColorMatrixElement.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGFEColorMatrixElement.cpp @@ -69,7 +69,7 @@ bool SVGFEColorMatrixElement::build(SVGResourceFilter* filterResource) { FilterEffect* input1 = filterResource->builder()->getEffectById(in1()); - if(!input1) + if (!input1) return false; Vector<float> _values; diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFEComponentTransferElement.cpp b/src/3rdparty/webkit/WebCore/svg/SVGFEComponentTransferElement.cpp index cad60dc..691d5cd 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFEComponentTransferElement.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGFEComponentTransferElement.cpp @@ -60,7 +60,7 @@ bool SVGFEComponentTransferElement::build(SVGResourceFilter* filterResource) { FilterEffect* input1 = filterResource->builder()->getEffectById(in1()); - if(!input1) + if (!input1) return false; ComponentTransferFunction red; diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFECompositeElement.cpp b/src/3rdparty/webkit/WebCore/svg/SVGFECompositeElement.cpp index 2205243..6eec6ea 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFECompositeElement.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGFECompositeElement.cpp @@ -85,7 +85,7 @@ bool SVGFECompositeElement::build(SVGResourceFilter* filterResource) FilterEffect* input1 = filterResource->builder()->getEffectById(in1()); FilterEffect* input2 = filterResource->builder()->getEffectById(in2()); - if(!input1 || !input2) + if (!input1 || !input2) return false; RefPtr<FilterEffect> effect = FEComposite::create(input1, input2, static_cast<CompositeOperationType>(_operator()), diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFEDiffuseLightingElement.cpp b/src/3rdparty/webkit/WebCore/svg/SVGFEDiffuseLightingElement.cpp index 00ff55a..edbd852 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFEDiffuseLightingElement.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGFEDiffuseLightingElement.cpp @@ -75,7 +75,7 @@ bool SVGFEDiffuseLightingElement::build(SVGResourceFilter* filterResource) { FilterEffect* input1 = filterResource->builder()->getEffectById(in1()); - if(!input1) + if (!input1) return false; RefPtr<RenderStyle> filterStyle = styleForRenderer(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFEDisplacementMapElement.cpp b/src/3rdparty/webkit/WebCore/svg/SVGFEDisplacementMapElement.cpp index 8ac668c..adf02fe 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFEDisplacementMapElement.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGFEDisplacementMapElement.cpp @@ -77,7 +77,7 @@ bool SVGFEDisplacementMapElement::build(SVGResourceFilter* filterResource) FilterEffect* input1 = filterResource->builder()->getEffectById(in1()); FilterEffect* input2 = filterResource->builder()->getEffectById(in2()); - if(!input1 || !input2) + if (!input1 || !input2) return false; diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFEDistantLightElement.h b/src/3rdparty/webkit/WebCore/svg/SVGFEDistantLightElement.h index e340549..95f45c8 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFEDistantLightElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGFEDistantLightElement.h @@ -23,10 +23,8 @@ #if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGFELightElement.h" -namespace WebCore -{ - class SVGFEDistantLightElement : public SVGFELightElement - { +namespace WebCore { + class SVGFEDistantLightElement : public SVGFELightElement { public: SVGFEDistantLightElement(const QualifiedName&, Document*); virtual ~SVGFEDistantLightElement(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFEFloodElement.cpp b/src/3rdparty/webkit/WebCore/svg/SVGFEFloodElement.cpp index e12b4e1..ae5ce94 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFEFloodElement.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGFEFloodElement.cpp @@ -55,7 +55,7 @@ bool SVGFEFloodElement::build(SVGResourceFilter* filterResource) { FilterEffect* input = filterResource->builder()->getEffectById(in1()); - if(!input) + if (!input) return false; RefPtr<RenderStyle> filterStyle = styleForRenderer(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFEFloodElement.h b/src/3rdparty/webkit/WebCore/svg/SVGFEFloodElement.h index 4a4cffc..ca4e18b 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFEFloodElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGFEFloodElement.h @@ -27,10 +27,8 @@ #include "SVGFEFlood.h" #include "SVGFilterPrimitiveStandardAttributes.h" -namespace WebCore -{ - class SVGFEFloodElement : public SVGFilterPrimitiveStandardAttributes - { +namespace WebCore { + class SVGFEFloodElement : public SVGFilterPrimitiveStandardAttributes { public: SVGFEFloodElement(const QualifiedName&, Document*); virtual ~SVGFEFloodElement(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFEFuncAElement.h b/src/3rdparty/webkit/WebCore/svg/SVGFEFuncAElement.h index 2c24039..8ec6b1c 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFEFuncAElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGFEFuncAElement.h @@ -26,10 +26,8 @@ #if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGComponentTransferFunctionElement.h" -namespace WebCore -{ - class SVGFEFuncAElement : public SVGComponentTransferFunctionElement - { +namespace WebCore { + class SVGFEFuncAElement : public SVGComponentTransferFunctionElement { public: SVGFEFuncAElement(const QualifiedName&, Document*); virtual ~SVGFEFuncAElement(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFEFuncBElement.h b/src/3rdparty/webkit/WebCore/svg/SVGFEFuncBElement.h index 1eb0889..5d86f87 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFEFuncBElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGFEFuncBElement.h @@ -26,10 +26,8 @@ #if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGComponentTransferFunctionElement.h" -namespace WebCore -{ - class SVGFEFuncBElement : public SVGComponentTransferFunctionElement - { +namespace WebCore { + class SVGFEFuncBElement : public SVGComponentTransferFunctionElement { public: SVGFEFuncBElement(const QualifiedName&, Document*); virtual ~SVGFEFuncBElement(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFEFuncGElement.h b/src/3rdparty/webkit/WebCore/svg/SVGFEFuncGElement.h index 973360e..9f5d3d7 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFEFuncGElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGFEFuncGElement.h @@ -26,10 +26,8 @@ #if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGComponentTransferFunctionElement.h" -namespace WebCore -{ - class SVGFEFuncGElement : public SVGComponentTransferFunctionElement - { +namespace WebCore { + class SVGFEFuncGElement : public SVGComponentTransferFunctionElement { public: SVGFEFuncGElement(const QualifiedName&, Document*); virtual ~SVGFEFuncGElement(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFEFuncRElement.h b/src/3rdparty/webkit/WebCore/svg/SVGFEFuncRElement.h index 3553954..0a0d115 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFEFuncRElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGFEFuncRElement.h @@ -26,10 +26,8 @@ #if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGComponentTransferFunctionElement.h" -namespace WebCore -{ - class SVGFEFuncRElement : public SVGComponentTransferFunctionElement - { +namespace WebCore { + class SVGFEFuncRElement : public SVGComponentTransferFunctionElement { public: SVGFEFuncRElement(const QualifiedName&, Document*); virtual ~SVGFEFuncRElement(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFEGaussianBlurElement.cpp b/src/3rdparty/webkit/WebCore/svg/SVGFEGaussianBlurElement.cpp index be3554f..4cddb5a 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFEGaussianBlurElement.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGFEGaussianBlurElement.cpp @@ -71,7 +71,7 @@ bool SVGFEGaussianBlurElement::build(SVGResourceFilter* filterResource) { FilterEffect* input1 = filterResource->builder()->getEffectById(in1()); - if(!input1) + if (!input1) return false; RefPtr<FilterEffect> effect = FEGaussianBlur::create(input1, stdDeviationX(), stdDeviationY()); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFEImageElement.cpp b/src/3rdparty/webkit/WebCore/svg/SVGFEImageElement.cpp index ae69e0d..8122960 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFEImageElement.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGFEImageElement.cpp @@ -86,7 +86,7 @@ void SVGFEImageElement::notifyFinished(CachedResource*) bool SVGFEImageElement::build(SVGResourceFilter* filterResource) { - if(!m_cachedImage) + if (!m_cachedImage) return false; RefPtr<FilterEffect> effect = FEImage::create(m_cachedImage.get()); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFEMergeElement.cpp b/src/3rdparty/webkit/WebCore/svg/SVGFEMergeElement.cpp index 0640066..cb3a781 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFEMergeElement.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGFEMergeElement.cpp @@ -49,7 +49,7 @@ bool SVGFEMergeElement::build(SVGResourceFilter* filterResource) } } - if(mergeInputs.isEmpty()) + if (mergeInputs.isEmpty()) return false; RefPtr<FilterEffect> effect = FEMerge::create(mergeInputs); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFEOffsetElement.cpp b/src/3rdparty/webkit/WebCore/svg/SVGFEOffsetElement.cpp index c7e4e77..945a9da 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFEOffsetElement.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGFEOffsetElement.cpp @@ -60,7 +60,7 @@ bool SVGFEOffsetElement::build(SVGResourceFilter* filterResource) { FilterEffect* input1 = filterResource->builder()->getEffectById(in1()); - if(!input1) + if (!input1) return false; RefPtr<FilterEffect> effect = FEOffset::create(input1, dx(), dy()); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFEPointLightElement.h b/src/3rdparty/webkit/WebCore/svg/SVGFEPointLightElement.h index edb9f9d..b39fffa 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFEPointLightElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGFEPointLightElement.h @@ -23,10 +23,8 @@ #if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGFELightElement.h" -namespace WebCore -{ - class SVGFEPointLightElement : public SVGFELightElement - { +namespace WebCore { + class SVGFEPointLightElement : public SVGFELightElement { public: SVGFEPointLightElement(const QualifiedName&, Document*); virtual ~SVGFEPointLightElement(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFESpecularLightingElement.cpp b/src/3rdparty/webkit/WebCore/svg/SVGFESpecularLightingElement.cpp index 36dd453..7afa4cc 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFESpecularLightingElement.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGFESpecularLightingElement.cpp @@ -90,7 +90,7 @@ bool SVGFESpecularLightingElement::build(SVGResourceFilter* filterResource) { FilterEffect* input1 = filterResource->builder()->getEffectById(in1()); - if(!input1) + if (!input1) return false; RefPtr<RenderStyle> filterStyle = styleForRenderer(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFESpotLightElement.h b/src/3rdparty/webkit/WebCore/svg/SVGFESpotLightElement.h index 629e51a..440c664 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFESpotLightElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGFESpotLightElement.h @@ -23,10 +23,8 @@ #if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGFELightElement.h" -namespace WebCore -{ - class SVGFESpotLightElement : public SVGFELightElement - { +namespace WebCore { + class SVGFESpotLightElement : public SVGFELightElement { public: SVGFESpotLightElement(const QualifiedName&, Document*); virtual ~SVGFESpotLightElement(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFETileElement.cpp b/src/3rdparty/webkit/WebCore/svg/SVGFETileElement.cpp index d5828eb..14af25f 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGFETileElement.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGFETileElement.cpp @@ -55,7 +55,7 @@ bool SVGFETileElement::build(SVGResourceFilter* filterResource) { FilterEffect* input1 = filterResource->builder()->getEffectById(in1()); - if(!input1) + if (!input1) return false; RefPtr<FilterEffect> effect = FETile::create(input1); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGLineElement.cpp b/src/3rdparty/webkit/WebCore/svg/SVGLineElement.cpp index 17c110c..cb31178 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGLineElement.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGLineElement.cpp @@ -59,8 +59,7 @@ void SVGLineElement::parseMappedAttribute(MappedAttribute* attr) setX2BaseValue(SVGLength(LengthModeWidth, attr->value())); else if (attr->name() == SVGNames::y2Attr) setY2BaseValue(SVGLength(LengthModeHeight, attr->value())); - else - { + else { if (SVGTests::parseMappedAttribute(attr)) return; if (SVGLangSpace::parseMappedAttribute(attr)) diff --git a/src/3rdparty/webkit/WebCore/svg/SVGList.h b/src/3rdparty/webkit/WebCore/svg/SVGList.h index 5381598..c04c200 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGList.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGList.h @@ -165,8 +165,7 @@ namespace WebCore { }; template<typename Item> - class SVGPODList : public SVGList<RefPtr<SVGPODListItem<Item> > > - { + class SVGPODList : public SVGList<RefPtr<SVGPODListItem<Item> > > { public: Item initialize(Item newItem, ExceptionCode& ec) { diff --git a/src/3rdparty/webkit/WebCore/svg/SVGListTraits.h b/src/3rdparty/webkit/WebCore/svg/SVGListTraits.h index b028ad5..d96bc67 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGListTraits.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGListTraits.h @@ -34,14 +34,12 @@ namespace WebCore { struct SVGListTraits { }; template<typename Item> - struct SVGListTraits<true, Item> - { + struct SVGListTraits<true, Item> { static Item nullItem() { return Item(); } }; template<> - struct SVGListTraits<false, double> - { + struct SVGListTraits<false, double> { static double nullItem() { return 0.0; } }; diff --git a/src/3rdparty/webkit/WebCore/svg/SVGMPathElement.h b/src/3rdparty/webkit/WebCore/svg/SVGMPathElement.h index 1e84cc7..988cead 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGMPathElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGMPathElement.h @@ -32,8 +32,7 @@ namespace WebCore { class SVGMPathElement : public SVGElement, SVGURIReference, - SVGExternalResourcesRequired - { + SVGExternalResourcesRequired { public: SVGMPathElement(const QualifiedName&, Document*); virtual ~SVGMPathElement(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGMetadataElement.h b/src/3rdparty/webkit/WebCore/svg/SVGMetadataElement.h index 4bd87d6..63d0aae 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGMetadataElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGMetadataElement.h @@ -26,10 +26,8 @@ #include "SVGElement.h" -namespace WebCore -{ - class SVGMetadataElement : public SVGElement - { +namespace WebCore { + class SVGMetadataElement : public SVGElement { public: SVGMetadataElement(const QualifiedName&, Document*); virtual ~SVGMetadataElement(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGParserUtilities.cpp b/src/3rdparty/webkit/WebCore/svg/SVGParserUtilities.cpp index 7d93f59..6f696e6 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGParserUtilities.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGParserUtilities.cpp @@ -246,7 +246,7 @@ bool SVGPathParser::parseSVG(const String& s, bool process) bool relative = false; - switch(command) + switch (command) { case 'm': relative = true; @@ -625,7 +625,7 @@ void SVGPathParser::calculateArc(bool relative, double& curx, double& cury, doub n_segs = (int) (int) ceil(fabs(th_arc / (piDouble * 0.5 + 0.001))); - for(i = 0; i < n_segs; i++) { + for (i = 0; i < n_segs; i++) { double sin_th, cos_th; double a00, a01, a10, a11; double x1, y1, x2, y2, x3, y3; diff --git a/src/3rdparty/webkit/WebCore/svg/SVGPathElement.h b/src/3rdparty/webkit/WebCore/svg/SVGPathElement.h index a39e628..362a85b 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGPathElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGPathElement.h @@ -56,8 +56,7 @@ namespace WebCore { public SVGTests, public SVGLangSpace, public SVGExternalResourcesRequired, - public SVGAnimatedPathData - { + public SVGAnimatedPathData { public: SVGPathElement(const QualifiedName&, Document*); virtual ~SVGPathElement(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGPathSeg.idl b/src/3rdparty/webkit/WebCore/svg/SVGPathSeg.idl index 597b01d..6754d2a 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGPathSeg.idl +++ b/src/3rdparty/webkit/WebCore/svg/SVGPathSeg.idl @@ -26,7 +26,7 @@ module svg { - interface [Conditional=SVG, GenerateConstructor, Polymorphic] SVGPathSeg { + interface [Conditional=SVG, CustomToJS, GenerateConstructor, Polymorphic] SVGPathSeg { // Path Segment Types const unsigned short PATHSEG_UNKNOWN = 0; const unsigned short PATHSEG_CLOSEPATH = 1; diff --git a/src/3rdparty/webkit/WebCore/svg/SVGPathSegClosePath.h b/src/3rdparty/webkit/WebCore/svg/SVGPathSegClosePath.h index eb74dea..190af9e 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGPathSegClosePath.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGPathSegClosePath.h @@ -27,10 +27,8 @@ #include "SVGPathSeg.h" -namespace WebCore -{ - class SVGPathSegClosePath : public SVGPathSeg - { +namespace WebCore { + class SVGPathSegClosePath : public SVGPathSeg { public: static PassRefPtr<SVGPathSegClosePath> create() { return adoptRef(new SVGPathSegClosePath); } virtual ~SVGPathSegClosePath(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGSVGElement.h b/src/3rdparty/webkit/WebCore/svg/SVGSVGElement.h index fe8575b..f92ed72 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGSVGElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGSVGElement.h @@ -33,8 +33,7 @@ #include "SVGTests.h" #include "SVGZoomAndPan.h" -namespace WebCore -{ +namespace WebCore { class SVGAngle; class SVGLength; class SVGTransform; @@ -46,8 +45,7 @@ namespace WebCore public SVGLangSpace, public SVGExternalResourcesRequired, public SVGFitToViewBox, - public SVGZoomAndPan - { + public SVGZoomAndPan { public: SVGSVGElement(const QualifiedName&, Document*); virtual ~SVGSVGElement(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGSetElement.h b/src/3rdparty/webkit/WebCore/svg/SVGSetElement.h index d47e003..fda6919 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGSetElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGSetElement.h @@ -26,11 +26,9 @@ #include "SVGAnimateElement.h" -namespace WebCore -{ +namespace WebCore { // SVGAnimateElement implements superset of the functionality. - class SVGSetElement : public SVGAnimateElement - { + class SVGSetElement : public SVGAnimateElement { public: SVGSetElement(const QualifiedName&, Document*); }; diff --git a/src/3rdparty/webkit/WebCore/svg/SVGSwitchElement.h b/src/3rdparty/webkit/WebCore/svg/SVGSwitchElement.h index 82153d9..a2be835 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGSwitchElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGSwitchElement.h @@ -29,13 +29,11 @@ #include "SVGStyledTransformableElement.h" #include "SVGTests.h" -namespace WebCore -{ +namespace WebCore { class SVGSwitchElement : public SVGStyledTransformableElement, public SVGTests, public SVGLangSpace, - public SVGExternalResourcesRequired - { + public SVGExternalResourcesRequired { public: SVGSwitchElement(const QualifiedName&, Document*); virtual ~SVGSwitchElement(); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGTextPathElement.cpp b/src/3rdparty/webkit/WebCore/svg/SVGTextPathElement.cpp index 0d8560a..54a4aa2 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGTextPathElement.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGTextPathElement.cpp @@ -57,7 +57,7 @@ void SVGTextPathElement::parseMappedAttribute(MappedAttribute* attr) else if (attr->name() == SVGNames::methodAttr) { if (value == "align") setSpacingBaseValue(SVG_TEXTPATH_METHODTYPE_ALIGN); - else if(value == "stretch") + else if (value == "stretch") setSpacingBaseValue(SVG_TEXTPATH_METHODTYPE_STRETCH); } else if (attr->name() == SVGNames::spacingAttr) { if (value == "auto") diff --git a/src/3rdparty/webkit/WebCore/svg/SVGTextPathElement.h b/src/3rdparty/webkit/WebCore/svg/SVGTextPathElement.h index e1dd938..4e8899a 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGTextPathElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGTextPathElement.h @@ -27,8 +27,7 @@ #include "SVGURIReference.h" -namespace WebCore -{ +namespace WebCore { enum SVGTextPathMethodType { SVG_TEXTPATH_METHODTYPE_UNKNOWN = 0, SVG_TEXTPATH_METHODTYPE_ALIGN = 1, @@ -42,8 +41,7 @@ namespace WebCore }; class SVGTextPathElement : public SVGTextContentElement, - public SVGURIReference - { + public SVGURIReference { public: // Forward declare these enums in the w3c naming scheme, for IDL generation enum { diff --git a/src/3rdparty/webkit/WebCore/svg/SVGTitleElement.h b/src/3rdparty/webkit/WebCore/svg/SVGTitleElement.h index cd4768c..e053a42 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGTitleElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGTitleElement.h @@ -27,11 +27,9 @@ #include "SVGLangSpace.h" #include "SVGStyledElement.h" -namespace WebCore -{ +namespace WebCore { class SVGTitleElement : public SVGStyledElement, - public SVGLangSpace - { + public SVGLangSpace { public: SVGTitleElement(const QualifiedName&, Document*); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGTransformDistance.cpp b/src/3rdparty/webkit/WebCore/svg/SVGTransformDistance.cpp index 34adc63..00b5387 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGTransformDistance.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGTransformDistance.cpp @@ -35,6 +35,8 @@ namespace WebCore { SVGTransformDistance::SVGTransformDistance() : m_type(SVGTransform::SVG_TRANSFORM_UNKNOWN) , m_angle(0) + , m_cx(0) + , m_cy(0) { } diff --git a/src/3rdparty/webkit/WebCore/svg/SVGTransformList.cpp b/src/3rdparty/webkit/WebCore/svg/SVGTransformList.cpp index ed457f4..648f1e9 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGTransformList.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGTransformList.cpp @@ -26,7 +26,6 @@ #include "TransformationMatrix.h" #include "SVGTransform.h" #include "SVGSVGElement.h" -#include "SVGTransformDistance.h" #include "SVGTransformList.h" using namespace WebCore; @@ -65,23 +64,6 @@ SVGTransform SVGTransformList::concatenate() const return SVGTransform(matrix); } -SVGTransform SVGTransformList::concatenateForType(SVGTransform::SVGTransformType type) const -{ - unsigned int length = numberOfItems(); - if (!length) - return SVGTransform(); - - ExceptionCode ec = 0; - SVGTransformDistance totalTransform; - for (unsigned int i = 0; i < length; i++) { - const SVGTransform& transform = getItem(i, ec); - if (transform.type() == type) - totalTransform.addSVGTransform(transform); - } - - return totalTransform.addToSVGTransform(SVGTransform()); -} - String SVGTransformList::valueAsString() const { // TODO: We may want to build a real transform string, instead of concatting to a matrix(...). diff --git a/src/3rdparty/webkit/WebCore/svg/SVGTransformList.h b/src/3rdparty/webkit/WebCore/svg/SVGTransformList.h index 442016b..d095fe4 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGTransformList.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGTransformList.h @@ -42,7 +42,6 @@ namespace WebCore { // Internal use only SVGTransform concatenate() const; - SVGTransform concatenateForType(SVGTransform::SVGTransformType) const; String valueAsString() const; diff --git a/src/3rdparty/webkit/WebCore/svg/SVGTransformable.cpp b/src/3rdparty/webkit/WebCore/svg/SVGTransformable.cpp index 6dbfc1a..17344ea 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGTransformable.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGTransformable.cpp @@ -154,12 +154,12 @@ bool SVGTransformable::parseTransformValue(unsigned type, const UChar*& ptr, con return true; } -static const UChar skewXDesc[] = {'s','k','e','w', 'X'}; -static const UChar skewYDesc[] = {'s','k','e','w', 'Y'}; -static const UChar scaleDesc[] = {'s','c','a','l', 'e'}; -static const UChar translateDesc[] = {'t','r','a','n', 's', 'l', 'a', 't', 'e'}; -static const UChar rotateDesc[] = {'r','o','t','a', 't', 'e'}; -static const UChar matrixDesc[] = {'m','a','t','r', 'i', 'x'}; +static const UChar skewXDesc[] = {'s', 'k', 'e', 'w', 'X'}; +static const UChar skewYDesc[] = {'s', 'k', 'e', 'w', 'Y'}; +static const UChar scaleDesc[] = {'s', 'c', 'a', 'l', 'e'}; +static const UChar translateDesc[] = {'t', 'r', 'a', 'n', 's', 'l', 'a', 't', 'e'}; +static const UChar rotateDesc[] = {'r', 'o', 't', 'a', 't', 'e'}; +static const UChar matrixDesc[] = {'m', 'a', 't', 'r', 'i', 'x'}; static inline bool parseAndSkipType(const UChar*& currTransform, const UChar* end, unsigned short& type) { diff --git a/src/3rdparty/webkit/WebCore/svg/SVGViewSpec.cpp b/src/3rdparty/webkit/WebCore/svg/SVGViewSpec.cpp index 6aa3857..b12b1c2 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGViewSpec.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGViewSpec.cpp @@ -82,7 +82,7 @@ const SVGElement* SVGViewSpec::contextElement() const return m_contextElement; } -static const UChar svgViewSpec[] = {'s','v','g','V', 'i', 'e', 'w'}; +static const UChar svgViewSpec[] = {'s', 'v', 'g', 'V', 'i', 'e', 'w'}; static const UChar viewBoxSpec[] = {'v', 'i', 'e', 'w', 'B', 'o', 'x'}; static const UChar preserveAspectRatioSpec[] = {'p', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'A', 's', 'p', 'e', 'c', 't', 'R', 'a', 't', 'i', 'o'}; static const UChar transformSpec[] = {'t', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm'}; diff --git a/src/3rdparty/webkit/WebCore/svg/animation/SMILTime.cpp b/src/3rdparty/webkit/WebCore/svg/animation/SMILTime.cpp index 70f9487..44e96a2 100644 --- a/src/3rdparty/webkit/WebCore/svg/animation/SMILTime.cpp +++ b/src/3rdparty/webkit/WebCore/svg/animation/SMILTime.cpp @@ -35,7 +35,8 @@ const double SMILTime::unresolvedValue = DBL_MAX; // Just a big value smaller than DBL_MAX. Our times are relative to 0, we don't really need the full range. const double SMILTime::indefiniteValue = FLT_MAX; -SMILTime WebCore::operator+(const SMILTime& a, const SMILTime& b) { +SMILTime WebCore::operator+(const SMILTime& a, const SMILTime& b) +{ if (a.isUnresolved() || b.isUnresolved()) return SMILTime::unresolved(); if (a.isIndefinite() || b.isIndefinite()) @@ -43,7 +44,8 @@ SMILTime WebCore::operator+(const SMILTime& a, const SMILTime& b) { return a.value() + b.value(); } -SMILTime WebCore::operator-(const SMILTime& a, const SMILTime& b) { +SMILTime WebCore::operator-(const SMILTime& a, const SMILTime& b) +{ if (a.isUnresolved() || b.isUnresolved()) return SMILTime::unresolved(); if (a.isIndefinite() || b.isIndefinite()) @@ -51,7 +53,8 @@ SMILTime WebCore::operator-(const SMILTime& a, const SMILTime& b) { return a.value() - b.value(); } -SMILTime WebCore::operator*(const SMILTime& a, const SMILTime& b) { +SMILTime WebCore::operator*(const SMILTime& a, const SMILTime& b) +{ if (a.isUnresolved() || b.isUnresolved()) return SMILTime::unresolved(); if (a.value() == 0 || b.value() == 0) diff --git a/src/3rdparty/webkit/WebCore/svg/animation/SVGSMILElement.h b/src/3rdparty/webkit/WebCore/svg/animation/SVGSMILElement.h index fac102e..b61f20d 100644 --- a/src/3rdparty/webkit/WebCore/svg/animation/SVGSMILElement.h +++ b/src/3rdparty/webkit/WebCore/svg/animation/SVGSMILElement.h @@ -38,8 +38,7 @@ namespace WebCore { class SMILTimeContainer; // This class implements SMIL interval timing model as needed for SVG animation. - class SVGSMILElement : public SVGElement - { + class SVGSMILElement : public SVGElement { public: SVGSMILElement(const QualifiedName&, Document*); virtual ~SVGSMILElement(); diff --git a/src/3rdparty/webkit/WebCore/svg/graphics/SVGImage.cpp b/src/3rdparty/webkit/WebCore/svg/graphics/SVGImage.cpp index 227b570..4efcf2e 100644 --- a/src/3rdparty/webkit/WebCore/svg/graphics/SVGImage.cpp +++ b/src/3rdparty/webkit/WebCore/svg/graphics/SVGImage.cpp @@ -222,7 +222,7 @@ NativeImagePtr SVGImage::nativeImageForCurrentFrame() bool SVGImage::dataChanged(bool allDataReceived) { // Don't do anything if is an empty image. - if (!m_data->size()) + if (!data()->size()) return true; if (allDataReceived) { @@ -251,7 +251,7 @@ bool SVGImage::dataChanged(bool allDataReceived) loader->commitProvisionalLoad(0); loader->setResponseMIMEType("image/svg+xml"); loader->begin(KURL()); // create the empty document - loader->write(m_data->data(), m_data->size()); + loader->write(data()->data(), data()->size()); loader->end(); frame->view()->setTransparent(true); // SVG Images are transparent. } diff --git a/src/3rdparty/webkit/WebCore/svg/graphics/SVGResource.cpp b/src/3rdparty/webkit/WebCore/svg/graphics/SVGResource.cpp index 82c10ba..049edc7 100644 --- a/src/3rdparty/webkit/WebCore/svg/graphics/SVGResource.cpp +++ b/src/3rdparty/webkit/WebCore/svg/graphics/SVGResource.cpp @@ -50,7 +50,8 @@ struct ResourceSet { typedef HashMap<SVGStyledElement*, ResourceSet*> ResourceClientMap; -static ResourceClientMap& clientMap() { +static ResourceClientMap& clientMap() +{ DEFINE_STATIC_LOCAL(ResourceClientMap, map, ()); return map; } |