Changeset 146273 in webkit

Timestamp:

Mar 19, 2013, 4:07:39 PM (12 years ago)

Author:

ggaren@apple.com

Message:

Removed a using declaration to avoid name conflicts
​https://bugs.webkit.org/show_bug.cgi?id=112752

Reviewed by Ryosuke Niwa.

• html/ClassList.cpp: Put the using declaration here instead.

• html/ClassList.h: Don't put a using declaration in this header because

it can cause name conflicts with SVGNames.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/ClassList.cpp (modified) (1 diff)
• html/ClassList.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-19  Geoffrey Garen  <ggaren@apple.com>
+
+        Removed a using declaration to avoid name conflicts
+        https://bugs.webkit.org/show_bug.cgi?id=112752
+
+        Reviewed by Ryosuke Niwa.
+
+        * html/ClassList.cpp: Put the using declaration here instead.
+
+        * html/ClassList.h: Don't put a using declaration in this header because
+        it can cause name conflicts with SVGNames.
+
 2013-03-18  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/html/ClassList.cpp

@@ -31 +31 @@
 
 namespace WebCore {
+
+using namespace HTMLNames;
 
 ClassList::ClassList(Element* element) : m_element(element) { }

trunk/Source/WebCore/html/ClassList.h

@@ -36 +36 @@
 namespace WebCore {
 
-using namespace HTMLNames;
-
 class Element;
 
@@ -66 +64 @@
     const SpaceSplitString& classNames() const;
 
-    virtual AtomicString value() const OVERRIDE { return m_element->getAttribute(classAttr); }
-    virtual void setValue(const AtomicString& value) OVERRIDE { m_element->setAttribute(classAttr, value); }
+    virtual AtomicString value() const OVERRIDE { return m_element->getAttribute(HTMLNames::classAttr); }
+    virtual void setValue(const AtomicString& value) OVERRIDE { m_element->setAttribute(HTMLNames::classAttr, value); }
 
     Element* m_element;