<!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>[184911] branches/safari-601.1.32-branch</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/184911">184911</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-27 11:39:07 -0700 (Wed, 27 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Roll out <a href="http://trac.webkit.org/projects/webkit/changeset/184894">r184894</a>. rdar://problem/21097484</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601132branchLayoutTestsChangeLog">branches/safari-601.1.32-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebCoreChangeLog">branches/safari-601.1.32-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebCorecssCSSParsercpp">branches/safari-601.1.32-branch/Source/WebCore/css/CSSParser.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari601132branchLayoutTestsfastdomHTMLFontElementfaceattributeexpectedtxt">branches/safari-601.1.32-branch/LayoutTests/fast/dom/HTMLFontElement/face-attribute-expected.txt</a></li>
<li><a href="#branchessafari601132branchLayoutTestsfastdomHTMLFontElementfaceattributehtml">branches/safari-601.1.32-branch/LayoutTests/fast/dom/HTMLFontElement/face-attribute.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601132branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/LayoutTests/ChangeLog (184910 => 184911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/LayoutTests/ChangeLog 2015-05-27 18:37:28 UTC (rev 184910)
+++ branches/safari-601.1.32-branch/LayoutTests/ChangeLog 2015-05-27 18:39:07 UTC (rev 184911)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> 2015-05-27 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Roll out r184894. rdar://problem/21097484
+
+2015-05-27 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r184894. rdar://problem/21097484
</span><span class="cx">
</span><span class="cx"> 2015-05-26 Andreas Kling <akling@apple.com>
</span></span></pre></div>
<a id="branchessafari601132branchLayoutTestsfastdomHTMLFontElementfaceattributeexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-601.1.32-branch/LayoutTests/fast/dom/HTMLFontElement/face-attribute-expected.txt (184910 => 184911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/LayoutTests/fast/dom/HTMLFontElement/face-attribute-expected.txt 2015-05-27 18:37:28 UTC (rev 184910)
+++ branches/safari-601.1.32-branch/LayoutTests/fast/dom/HTMLFontElement/face-attribute-expected.txt 2015-05-27 18:39:07 UTC (rev 184911)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-HTMLFontElement face attribute test
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS fontFaceAttributeEffect("") is null
-PASS fontFaceAttributeEffect(" ") is null
-PASS fontFaceAttributeEffect(",") is null
-PASS fontFaceAttributeEffect(" ,") is null
-PASS fontFaceAttributeEffect(" , ") is null
-PASS fontFaceAttributeEffect(",,") is null
-PASS fontFaceAttributeEffect("serif") is "serif"
-PASS fontFaceAttributeEffect("serif ") is "serif"
-PASS fontFaceAttributeEffect(",serif,") is null
-PASS fontFaceAttributeEffect(" serif ") is "serif"
-PASS fontFaceAttributeEffect(" serif") is "serif"
-PASS fontFaceAttributeEffect("serif ,") is null
-PASS fontFaceAttributeEffect("serif , ") is null
-PASS fontFaceAttributeEffect("serif,,") is null
-PASS fontFaceAttributeEffect("Serif") is "serif"
-PASS fontFaceAttributeEffect(" Serif") is "serif"
-PASS fontFaceAttributeEffect(" Serif ") is "serif"
-PASS fontFaceAttributeEffect(",Serif ") is null
-PASS fontFaceAttributeEffect("Inherited") is "Inherited"
-PASS fontFaceAttributeEffect("Initial") is "Initial"
-PASS fontFaceAttributeEffect("foo + foo") is "'foo + foo'"
-PASS fontFaceAttributeEffect(" foo + foo") is "'foo + foo'"
-PASS fontFaceAttributeEffect(" foo + foo ") is "'foo + foo'"
-PASS fontFaceAttributeEffect("foo + foo ") is "'foo + foo'"
-PASS fontFaceAttributeEffect("foo + foo,serif") is "'foo + foo', serif"
-PASS fontFaceAttributeEffect("serif,foo + foo,serif") is "serif, 'foo + foo', serif"
-PASS fontFaceAttributeEffect(",foo + foo,serif") is null
-PASS fontFaceAttributeEffect("serif,foo + foo,") is null
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="branchessafari601132branchLayoutTestsfastdomHTMLFontElementfaceattributehtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-601.1.32-branch/LayoutTests/fast/dom/HTMLFontElement/face-attribute.html (184910 => 184911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/LayoutTests/fast/dom/HTMLFontElement/face-attribute.html 2015-05-27 18:37:28 UTC (rev 184910)
+++ branches/safari-601.1.32-branch/LayoutTests/fast/dom/HTMLFontElement/face-attribute.html 2015-05-27 18:39:07 UTC (rev 184911)
</span><span class="lines">@@ -1,63 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<script src="../../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script>
-
-description("HTMLFontElement face attribute test");
-
-function fontFaceAttributeEffect(value)
-{
- var element = document.createElement("font");
- element.setAttribute("face", value);
- var outerElement = document.createElement("p");
- outerElement.setAttribute("style", "font-family: whatever");
- document.body.appendChild(outerElement);
- outerElement.appendChild(element);
- var computedStyle = getComputedStyle(element, "");
- var result = computedStyle.fontFamily;
- document.body.removeChild(outerElement);
- return result === "whatever" ? null : result;
-}
-
-shouldBe('fontFaceAttributeEffect("")', 'null');
-shouldBe('fontFaceAttributeEffect(" ")', 'null');
-shouldBe('fontFaceAttributeEffect(",")', 'null');
-shouldBe('fontFaceAttributeEffect(" ,")', 'null');
-shouldBe('fontFaceAttributeEffect(" , ")', 'null');
-shouldBe('fontFaceAttributeEffect(",,")', 'null');
-
-shouldBe('fontFaceAttributeEffect("serif")', '"serif"');
-shouldBe('fontFaceAttributeEffect("serif ")', '"serif"');
-shouldBe('fontFaceAttributeEffect(",serif,")', 'null');
-shouldBe('fontFaceAttributeEffect(" serif ")', '"serif"');
-shouldBe('fontFaceAttributeEffect(" serif")', '"serif"');
-shouldBe('fontFaceAttributeEffect("serif ,")', 'null');
-shouldBe('fontFaceAttributeEffect("serif , ")', 'null');
-shouldBe('fontFaceAttributeEffect("serif,,")', 'null');
-
-shouldBe('fontFaceAttributeEffect("Serif")', '"serif"');
-shouldBe('fontFaceAttributeEffect(" Serif")', '"serif"');
-shouldBe('fontFaceAttributeEffect(" Serif ")', '"serif"');
-shouldBe('fontFaceAttributeEffect(",Serif ")', 'null');
-
-shouldBe('fontFaceAttributeEffect("Inherited")', '"Inherited"');
-shouldBe('fontFaceAttributeEffect("Initial")', '"Initial"');
-
-shouldBe('fontFaceAttributeEffect("foo + foo")', '"\'foo + foo\'"');
-shouldBe('fontFaceAttributeEffect(" foo + foo")', '"\'foo + foo\'"');
-shouldBe('fontFaceAttributeEffect(" foo + foo ")', '"\'foo + foo\'"');
-shouldBe('fontFaceAttributeEffect("foo + foo ")', '"\'foo + foo\'"');
-
-shouldBe('fontFaceAttributeEffect("foo + foo,serif")', '"\'foo + foo\', serif"');
-shouldBe('fontFaceAttributeEffect("serif,foo + foo,serif")', '"serif, \'foo + foo\', serif"');
-shouldBe('fontFaceAttributeEffect(",foo + foo,serif")', 'null');
-shouldBe('fontFaceAttributeEffect("serif,foo + foo,")', 'null');
-
-</script>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="branchessafari601132branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184910 => 184911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-27 18:37:28 UTC (rev 184910)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-27 18:39:07 UTC (rev 184911)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> 2015-05-27 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Roll out r184894. rdar://problem/21097484
+
+2015-05-27 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r184894. rdar://problem/21097484
</span><span class="cx">
</span><span class="cx"> 2015-05-26 Andreas Kling <akling@apple.com>
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/css/CSSParser.cpp (184910 => 184911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/css/CSSParser.cpp 2015-05-27 18:37:28 UTC (rev 184910)
+++ branches/safari-601.1.32-branch/Source/WebCore/css/CSSParser.cpp 2015-05-27 18:39:07 UTC (rev 184911)
</span><span class="lines">@@ -1282,30 +1282,15 @@
</span><span class="cx"> {
</span><span class="cx"> if (string.isEmpty())
</span><span class="cx"> return nullptr;
</span><ins>+ RefPtr<MutableStyleProperties> dummyStyle = MutableStyleProperties::create();
</ins><span class="cx">
</span><del>- Ref<CSSValueList> valueList = CSSValueList::createCommaSeparated();
</del><ins>+ if (parseValue(dummyStyle.get(), CSSPropertyFontFamily, string, false, CSSQuirksMode, nullptr) == ParseResult::Error)
+ return nullptr;
</ins><span class="cx">
</span><del>- Vector<String> familyNames;
- string.string().split(',', true, familyNames);
-
- for (auto& familyName : familyNames) {
- String stripped = stripLeadingAndTrailingHTMLSpaces(familyName);
- if (stripped.isEmpty())
- return nullptr;
-
- RefPtr<CSSValue> value;
- for (auto propertyID : { CSSValueSerif, CSSValueSansSerif, CSSValueCursive, CSSValueFantasy, CSSValueMonospace, CSSValueWebkitBody }) {
- if (equalIgnoringCase(stripped, getValueName(propertyID))) {
- value = cssValuePool().createIdentifierValue(propertyID);
- break;
- }
- }
- if (!value)
- value = cssValuePool().createFontFamilyValue(stripped);
- valueList->append(value.releaseNonNull());
- }
-
- return WTF::move(valueList);
</del><ins>+ RefPtr<CSSValue> fontFamily = dummyStyle->getPropertyCSSValue(CSSPropertyFontFamily);
+ if (!fontFamily->isValueList())
+ return nullptr; // FIXME: "initial" and "inherit" should be parsed as font names in the face attribute.
+ return static_pointer_cast<CSSValueList>(fontFamily.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSParser::ParseResult CSSParser::parseValue(MutableStyleProperties* declaration, CSSPropertyID propertyID, const String& string, bool important, CSSParserMode cssParserMode, StyleSheetContents* contextStyleSheet)
</span></span></pre>
</div>
</div>
</body>
</html>