Title: [146273] trunk/Source/WebCore
- Revision
- 146273
- Author
- gga...@apple.com
- Date
- 2013-03-19 16:07:39 -0700 (Tue, 19 Mar 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (146272 => 146273)
--- trunk/Source/WebCore/ChangeLog 2013-03-19 22:37:55 UTC (rev 146272)
+++ trunk/Source/WebCore/ChangeLog 2013-03-19 23:07:39 UTC (rev 146273)
@@ -1,3 +1,15 @@
+2013-03-19 Geoffrey Garen <gga...@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 <o...@chromium.org>
Make intrinsic size keywords on flexboxes work
Modified: trunk/Source/WebCore/html/ClassList.cpp (146272 => 146273)
--- trunk/Source/WebCore/html/ClassList.cpp 2013-03-19 22:37:55 UTC (rev 146272)
+++ trunk/Source/WebCore/html/ClassList.cpp 2013-03-19 23:07:39 UTC (rev 146273)
@@ -31,6 +31,8 @@
namespace WebCore {
+using namespace HTMLNames;
+
ClassList::ClassList(Element* element) : m_element(element) { }
void ClassList::ref()
Modified: trunk/Source/WebCore/html/ClassList.h (146272 => 146273)
--- trunk/Source/WebCore/html/ClassList.h 2013-03-19 22:37:55 UTC (rev 146272)
+++ trunk/Source/WebCore/html/ClassList.h 2013-03-19 23:07:39 UTC (rev 146273)
@@ -35,8 +35,6 @@
namespace WebCore {
-using namespace HTMLNames;
-
class Element;
typedef int ExceptionCode;
@@ -65,8 +63,8 @@
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;
mutable OwnPtr<SpaceSplitString> m_classNamesForQuirksMode;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
