Changeset 179829 in webkit

Timestamp:

Feb 9, 2015, 9:15:28 AM (12 years ago)

Author:

Darin Adler

Message:

Try to fix build on platforms that use SVG "all in one" file (Windows).

• svg/SVGAElement.cpp: Don't do "using namespace HTMLNames;" outside of

function boundaries, because that will be inherited by other files.
(WebCore::SVGAElement::isURLAttribute): Use XLinkNames directly here
instead of using HTMLNames implicitly.

• svg/SVGElement.cpp: Don't do "using namespace HTMLNames;" outside of

function boundaries, because that will be inherited by other files.
(WebCore::populateAttributeNameToCSSPropertyIDMap): Instead do it in here.
(WebCore::populateAttributeNameToAnimatedPropertyTypeMap): And here.
(WebCore::populateCSSPropertyWithSVGDOMNameToAnimatedPropertyTypeMap): And here.
(WebCore::SVGElement::parseAttribute): And use HTMLNames directly here
instead of implicitly.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/SVGAElement.cpp (modified) (2 diffs)
• svg/SVGElement.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-09  Darin Adler  <darin@apple.com>
+
+        Try to fix build on platforms that use SVG "all in one" file (Windows).
+
+        * svg/SVGAElement.cpp: Don't do "using namespace HTMLNames;" outside of
+        function boundaries, because that will be inherited by other files.
+        (WebCore::SVGAElement::isURLAttribute): Use XLinkNames directly here
+        instead of using HTMLNames implicitly.
+
+        * svg/SVGElement.cpp: Don't do "using namespace HTMLNames;" outside of
+        function boundaries, because that will be inherited by other files.
+        (WebCore::populateAttributeNameToCSSPropertyIDMap): Instead do it in here.
+        (WebCore::populateAttributeNameToAnimatedPropertyTypeMap): And here.
+        (WebCore::populateCSSPropertyWithSVGDOMNameToAnimatedPropertyTypeMap): And here.
+        (WebCore::SVGElement::parseAttribute): And use HTMLNames directly here
+        instead of implicitly.
+
 2015-02-09  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/svg/SVGAElement.cpp

@@ -48 +48 @@
 namespace WebCore {
 
-using namespace HTMLNames;
-
 // Animated property definitions
 DEFINE_ANIMATED_STRING(SVGAElement, SVGNames::targetAttr, SVGTarget, svgTarget)
@@ -210 +208 @@
 bool SVGAElement::isURLAttribute(const Attribute& attribute) const
 {
-    return attribute.name().localName() == hrefAttr || SVGGraphicsElement::isURLAttribute(attribute);
+    return attribute.name().localName() == XLinkNames::hrefAttr || SVGGraphicsElement::isURLAttribute(attribute);
 }
 

trunk/Source/WebCore/svg/SVGElement.cpp

@@ -73 +73 @@
 END_REGISTER_ANIMATED_PROPERTIES
 
-using namespace HTMLNames;
-using namespace SVGNames;
-
 static NEVER_INLINE void populateAttributeNameToCSSPropertyIDMap(HashMap<AtomicStringImpl*, CSSPropertyID>& map)
 {
+    using namespace HTMLNames;
+    using namespace SVGNames;
+
     // This list should include all base CSS and SVG CSS properties which are exposed as SVG XML attributes.
     static const QualifiedName* const attributeNames[] = {
@@ -165 +165 @@
 static NEVER_INLINE void populateAttributeNameToAnimatedPropertyTypeMap(HashMap<QualifiedName::QualifiedNameImpl*, AnimatedPropertyType>& map)
 {
+    using namespace HTMLNames;
+    using namespace SVGNames;
+
     struct TableEntry {
         const QualifiedName& attributeName;
@@ -243 +246 @@
 static NEVER_INLINE void populateCSSPropertyWithSVGDOMNameToAnimatedPropertyTypeMap(HashMap<QualifiedName::QualifiedNameImpl*, AnimatedPropertyType>& map)
 {
+    using namespace HTMLNames;
+    using namespace SVGNames;
+
     struct TableEntry {
         const QualifiedName& attributeName;
@@ -509 +515 @@
     if (name == HTMLNames::classAttr)
         setClassNameBaseValue(value);
-    else if (name == tabindexAttr) {
+    else if (name == HTMLNames::tabindexAttr) {
         int tabindex = 0;
         if (value.isEmpty())