Title: [179829] trunk/Source/WebCore
- Revision
- 179829
- Author
- [email protected]
- Date
- 2015-02-09 09:15:28 -0800 (Mon, 09 Feb 2015)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (179828 => 179829)
--- trunk/Source/WebCore/ChangeLog 2015-02-09 16:37:41 UTC (rev 179828)
+++ trunk/Source/WebCore/ChangeLog 2015-02-09 17:15:28 UTC (rev 179829)
@@ -1,3 +1,20 @@
+2015-02-09 Darin Adler <[email protected]>
+
+ 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 <[email protected]>
[iOS] exit from fullscreen when player view controller calls delegate
Modified: trunk/Source/WebCore/svg/SVGAElement.cpp (179828 => 179829)
--- trunk/Source/WebCore/svg/SVGAElement.cpp 2015-02-09 16:37:41 UTC (rev 179828)
+++ trunk/Source/WebCore/svg/SVGAElement.cpp 2015-02-09 17:15:28 UTC (rev 179829)
@@ -47,8 +47,6 @@
namespace WebCore {
-using namespace HTMLNames;
-
// Animated property definitions
DEFINE_ANIMATED_STRING(SVGAElement, SVGNames::targetAttr, SVGTarget, svgTarget)
DEFINE_ANIMATED_STRING(SVGAElement, XLinkNames::hrefAttr, Href, href)
@@ -209,7 +207,7 @@
bool SVGAElement::isURLAttribute(const Attribute& attribute) const
{
- return attribute.name().localName() == hrefAttr || SVGGraphicsElement::isURLAttribute(attribute);
+ return attribute.name().localName() == XLinkNames::hrefAttr || SVGGraphicsElement::isURLAttribute(attribute);
}
bool SVGAElement::isMouseFocusable() const
Modified: trunk/Source/WebCore/svg/SVGElement.cpp (179828 => 179829)
--- trunk/Source/WebCore/svg/SVGElement.cpp 2015-02-09 16:37:41 UTC (rev 179828)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2015-02-09 17:15:28 UTC (rev 179829)
@@ -72,11 +72,11 @@
REGISTER_LOCAL_ANIMATED_PROPERTY(className)
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[] = {
&alignment_baselineAttr,
@@ -164,6 +164,9 @@
static NEVER_INLINE void populateAttributeNameToAnimatedPropertyTypeMap(HashMap<QualifiedName::QualifiedNameImpl*, AnimatedPropertyType>& map)
{
+ using namespace HTMLNames;
+ using namespace SVGNames;
+
struct TableEntry {
const QualifiedName& attributeName;
AnimatedPropertyType type;
@@ -242,6 +245,9 @@
static NEVER_INLINE void populateCSSPropertyWithSVGDOMNameToAnimatedPropertyTypeMap(HashMap<QualifiedName::QualifiedNameImpl*, AnimatedPropertyType>& map)
{
+ using namespace HTMLNames;
+ using namespace SVGNames;
+
struct TableEntry {
const QualifiedName& attributeName;
AnimatedPropertyType type;
@@ -508,7 +514,7 @@
{
if (name == HTMLNames::classAttr)
setClassNameBaseValue(value);
- else if (name == tabindexAttr) {
+ else if (name == HTMLNames::tabindexAttr) {
int tabindex = 0;
if (value.isEmpty())
clearTabIndexExplicitlyIfNeeded();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
