Title: [89786] trunk/Source/WebCore
- Revision
- 89786
- Author
- [email protected]
- Date
- 2011-06-26 23:39:01 -0700 (Sun, 26 Jun 2011)
Log Message
2011-06-26 Adam Barth <[email protected]>
Build fix for clang. Apparently clang doesn't want us to use the std
namespace in headers, which makes sense.
* svg/SVGAnimatedType.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (89785 => 89786)
--- trunk/Source/WebCore/ChangeLog 2011-06-27 06:31:48 UTC (rev 89785)
+++ trunk/Source/WebCore/ChangeLog 2011-06-27 06:39:01 UTC (rev 89786)
@@ -1,5 +1,12 @@
2011-06-26 Adam Barth <[email protected]>
+ Build fix for clang. Apparently clang doesn't want us to use the std
+ namespace in headers, which makes sense.
+
+ * svg/SVGAnimatedType.h:
+
+2011-06-26 Adam Barth <[email protected]>
+
Reviewed by Eric Seidel.
Remove LegacyDefaultOptionalArguments from XMLHttpRequest.idl and XMLHttpRequestUpload.idl
Modified: trunk/Source/WebCore/svg/SVGAnimatedType.h (89785 => 89786)
--- trunk/Source/WebCore/svg/SVGAnimatedType.h 2011-06-27 06:31:48 UTC (rev 89785)
+++ trunk/Source/WebCore/svg/SVGAnimatedType.h 2011-06-27 06:39:01 UTC (rev 89786)
@@ -23,8 +23,6 @@
#if ENABLE(SVG) && ENABLE(SVG_ANIMATION)
#include "SVGElement.h"
-using namespace std;
-
namespace WebCore {
class Color;
@@ -47,12 +45,12 @@
static PassOwnPtr<SVGAnimatedType> createLengthList(SVGLengthList*);
static PassOwnPtr<SVGAnimatedType> createNumber(float*);
static PassOwnPtr<SVGAnimatedType> createNumberList(SVGNumberList*);
- static PassOwnPtr<SVGAnimatedType> createNumberOptionalNumber(pair<float, float>*);
+ static PassOwnPtr<SVGAnimatedType> createNumberOptionalNumber(std::pair<float, float>*);
static PassOwnPtr<SVGAnimatedType> createPath(PassOwnPtr<SVGPathByteStream>);
static PassOwnPtr<SVGAnimatedType> createPointList(SVGPointList*);
static PassOwnPtr<SVGAnimatedType> createRect(FloatRect*);
static PassOwnPtr<SVGAnimatedType> createString(String*);
-
+
AnimatedAttributeType type() const { return m_type; }
SVGAngle& angle();
@@ -61,7 +59,7 @@
SVGLengthList& lengthList();
float& number();
SVGNumberList& numberList();
- pair<float, float>& numberOptionalNumber();
+ std::pair<float, float>& numberOptionalNumber();
SVGPathByteStream* path();
SVGPointList& pointList();
FloatRect& rect();
@@ -69,18 +67,18 @@
String valueAsString();
bool setValueAsString(const QualifiedName&, const String&);
-
+
private:
SVGAnimatedType(AnimatedAttributeType);
-
+
AnimatedAttributeType m_type;
-
+
union DataUnion {
DataUnion()
: length(0)
{
}
-
+
// FIXME: More SVG primitive types need to be added step by step.
SVGAngle* angle;
Color* color;
@@ -88,7 +86,7 @@
SVGLengthList* lengthList;
float* number;
SVGNumberList* numberList;
- pair<float, float>* numberOptionalNumber;
+ std::pair<float, float>* numberOptionalNumber;
SVGPathByteStream* path;
SVGPointList* pointList;
FloatRect* rect;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
