<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[179829] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179829">179829</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2015-02-09 09:15:28 -0800 (Mon, 09 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoresvgSVGAElementcpp">trunk/Source/WebCore/svg/SVGAElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementcpp">trunk/Source/WebCore/svg/SVGElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179828 => 179829)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+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.
+
</ins><span class="cx"> 2015-02-09 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] exit from fullscreen when player view controller calls delegate
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGAElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGAElement.cpp (179828 => 179829)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -47,8 +47,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-using namespace HTMLNames;
-
</del><span class="cx"> // Animated property definitions
</span><span class="cx"> DEFINE_ANIMATED_STRING(SVGAElement, SVGNames::targetAttr, SVGTarget, svgTarget)
</span><span class="cx"> DEFINE_ANIMATED_STRING(SVGAElement, XLinkNames::hrefAttr, Href, href)
</span><span class="lines">@@ -209,7 +207,7 @@
</span><span class="cx">
</span><span class="cx"> bool SVGAElement::isURLAttribute(const Attribute& attribute) const
</span><span class="cx"> {
</span><del>- return attribute.name().localName() == hrefAttr || SVGGraphicsElement::isURLAttribute(attribute);
</del><ins>+ return attribute.name().localName() == XLinkNames::hrefAttr || SVGGraphicsElement::isURLAttribute(attribute);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool SVGAElement::isMouseFocusable() const
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.cpp (179828 => 179829)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -72,11 +72,11 @@
</span><span class="cx"> REGISTER_LOCAL_ANIMATED_PROPERTY(className)
</span><span class="cx"> END_REGISTER_ANIMATED_PROPERTIES
</span><span class="cx">
</span><del>-using namespace HTMLNames;
-using namespace SVGNames;
-
</del><span class="cx"> static NEVER_INLINE void populateAttributeNameToCSSPropertyIDMap(HashMap<AtomicStringImpl*, CSSPropertyID>& map)
</span><span class="cx"> {
</span><ins>+ using namespace HTMLNames;
+ using namespace SVGNames;
+
</ins><span class="cx"> // This list should include all base CSS and SVG CSS properties which are exposed as SVG XML attributes.
</span><span class="cx"> static const QualifiedName* const attributeNames[] = {
</span><span class="cx"> &alignment_baselineAttr,
</span><span class="lines">@@ -164,6 +164,9 @@
</span><span class="cx">
</span><span class="cx"> static NEVER_INLINE void populateAttributeNameToAnimatedPropertyTypeMap(HashMap<QualifiedName::QualifiedNameImpl*, AnimatedPropertyType>& map)
</span><span class="cx"> {
</span><ins>+ using namespace HTMLNames;
+ using namespace SVGNames;
+
</ins><span class="cx"> struct TableEntry {
</span><span class="cx"> const QualifiedName& attributeName;
</span><span class="cx"> AnimatedPropertyType type;
</span><span class="lines">@@ -242,6 +245,9 @@
</span><span class="cx">
</span><span class="cx"> static NEVER_INLINE void populateCSSPropertyWithSVGDOMNameToAnimatedPropertyTypeMap(HashMap<QualifiedName::QualifiedNameImpl*, AnimatedPropertyType>& map)
</span><span class="cx"> {
</span><ins>+ using namespace HTMLNames;
+ using namespace SVGNames;
+
</ins><span class="cx"> struct TableEntry {
</span><span class="cx"> const QualifiedName& attributeName;
</span><span class="cx"> AnimatedPropertyType type;
</span><span class="lines">@@ -508,7 +514,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (name == HTMLNames::classAttr)
</span><span class="cx"> setClassNameBaseValue(value);
</span><del>- else if (name == tabindexAttr) {
</del><ins>+ else if (name == HTMLNames::tabindexAttr) {
</ins><span class="cx"> int tabindex = 0;
</span><span class="cx"> if (value.isEmpty())
</span><span class="cx"> clearTabIndexExplicitlyIfNeeded();
</span></span></pre>
</div>
</div>
</body>
</html>