<!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>[209509] trunk</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/209509">209509</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-12-07 18:01:30 -0800 (Wed, 07 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Stop skipping tests in the css3 LayoutTests subdirectory
https://bugs.webkit.org/show_bug.cgi?id=165574
Reviewed by Dean Jackson.
Source/WebCore:
* css/CSSGroupingRule.cpp:
(WebCore::CSSGroupingRule::insertRule):
The old parser didn't support the creation of @namespace rules in the
CSS OM, but the new parser does. We need to ensure that just like for
@import rules, that the insertion of a @namespace rule inside a
@supports rule is not allowed. This test passed in the old parser because
the rule just didn't get created, but in the new parser, we need to
add a check along with the @import rule check to ensure it isn't allowed.
LayoutTests:
* TestExpectations:
Stop skipping two tests.
* css3/font-variant-parsing-expected.txt:
* css3/font-variant-parsing.html:
Patched to yield the correct results when multiple values are specified for the
same sub-property.
* css3/supports-cssom-expected.txt:
* css3/supports-cssom.html:
Patched to account for the new result for @namespace insertion failure (see
corresponding WebCore ChangeLog for explanation), and also patched to get rid
of excess whitespace, since the new parser doesn't preserve whitespace formatting
when serializing @supports.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestscss3fontvariantparsingexpectedtxt">trunk/LayoutTests/css3/font-variant-parsing-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3fontvariantparsinghtml">trunk/LayoutTests/css3/font-variant-parsing.html</a></li>
<li><a href="#trunkLayoutTestscss3supportscssomexpectedtxt">trunk/LayoutTests/css3/supports-cssom-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3supportscssomhtml">trunk/LayoutTests/css3/supports-cssom.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSGroupingRulecpp">trunk/Source/WebCore/css/CSSGroupingRule.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209508 => 209509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-08 01:49:40 UTC (rev 209508)
+++ trunk/LayoutTests/ChangeLog 2016-12-08 02:01:30 UTC (rev 209509)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-12-07 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Stop skipping tests in the css3 LayoutTests subdirectory
+ https://bugs.webkit.org/show_bug.cgi?id=165574
+
+ Reviewed by Dean Jackson.
+
+ * TestExpectations:
+ Stop skipping two tests.
+
+ * css3/font-variant-parsing-expected.txt:
+ * css3/font-variant-parsing.html:
+ Patched to yield the correct results when multiple values are specified for the
+ same sub-property.
+
+ * css3/supports-cssom-expected.txt:
+ * css3/supports-cssom.html:
+ Patched to account for the new result for @namespace insertion failure (see
+ corresponding WebCore ChangeLog for explanation), and also patched to get rid
+ of excess whitespace, since the new parser doesn't preserve whitespace formatting
+ when serializing @supports.
+
</ins><span class="cx"> 2016-12-07 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, Skip imported/w3c/WebCryptoAPI/generateKey/test_failures.html
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (209508 => 209509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2016-12-08 01:49:40 UTC (rev 209508)
+++ trunk/LayoutTests/TestExpectations 2016-12-08 02:01:30 UTC (rev 209509)
</span><span class="lines">@@ -997,8 +997,6 @@
</span><span class="cx">
</span><span class="cx"> # The following layout tests need to be changed when the new CSS Parser is turned on, since they
</span><span class="cx"> # incorrectly indicate failures on valid syntax.
</span><del>-webkit.org/b/165195 css3/font-variant-parsing.html [ Pass Failure ]
-webkit.org/b/165195 css3/supports-cssom.html [ Pass Failure ]
</del><span class="cx"> webkit.org/b/165195 fast/css/attr-parsing.html [ Pass Failure ]
</span><span class="cx"> webkit.org/b/165195 fast/css/font-family-parse-keyword.html [ Skip ]
</span><span class="cx"> webkit.org/b/165195 fast/css/font-property-priority.html [ Pass Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestscss3fontvariantparsingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/font-variant-parsing-expected.txt (209508 => 209509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/font-variant-parsing-expected.txt 2016-12-08 01:49:40 UTC (rev 209508)
+++ trunk/LayoutTests/css3/font-variant-parsing-expected.txt 2016-12-08 02:01:30 UTC (rev 209509)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "normal"
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "normal"
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "common-ligatures"
</span><del>-PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "common-ligatures"
</del><ins>+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "normal"
</ins><span class="cx"> PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "no-common-ligatures"
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "discretionary-ligatures"
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-ligatures').cssText is "no-discretionary-ligatures"
</span><span class="lines">@@ -49,9 +49,9 @@
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "ordinal"
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "slashed-zero"
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "lining-nums slashed-zero"
</span><del>-PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "oldstyle-nums"
-PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "tabular-nums"
-PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "stacked-fractions"
</del><ins>+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "normal"
+PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "normal"
</ins><span class="cx"> PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "lining-nums proportional-nums"
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "lining-nums diagonal-fractions"
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('testElement')).getPropertyCSSValue('font-variant-numeric').cssText is "ordinal slashed-zero"
</span></span></pre></div>
<a id="trunkLayoutTestscss3fontvariantparsinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/font-variant-parsing.html (209508 => 209509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/font-variant-parsing.html 2016-12-08 01:49:40 UTC (rev 209508)
+++ trunk/LayoutTests/css3/font-variant-parsing.html 2016-12-08 02:01:30 UTC (rev 209509)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> runTest("font-variant-ligatures", "normal common-ligatures", "normal");
</span><span class="cx"> runTest("font-variant-ligatures", "notavalidvalue", "normal");
</span><span class="cx"> runTest("font-variant-ligatures", "common-ligatures", "common-ligatures");
</span><del>-runTest("font-variant-ligatures", "common-ligatures common-ligatures", "common-ligatures");
</del><ins>+runTest("font-variant-ligatures", "common-ligatures common-ligatures", "normal");
</ins><span class="cx"> runTest("font-variant-ligatures", "no-common-ligatures", "no-common-ligatures");
</span><span class="cx"> runTest("font-variant-ligatures", "discretionary-ligatures", "discretionary-ligatures");
</span><span class="cx"> runTest("font-variant-ligatures", "no-discretionary-ligatures", "no-discretionary-ligatures");
</span><span class="lines">@@ -69,9 +69,9 @@
</span><span class="cx"> runTest("font-variant-numeric", "ordinal", "ordinal");
</span><span class="cx"> runTest("font-variant-numeric", "slashed-zero", "slashed-zero");
</span><span class="cx"> runTest("font-variant-numeric", "lining-nums slashed-zero", "lining-nums slashed-zero");
</span><del>-runTest("font-variant-numeric", "lining-nums oldstyle-nums", "oldstyle-nums");
-runTest("font-variant-numeric", "proportional-nums tabular-nums", "tabular-nums");
-runTest("font-variant-numeric", "diagonal-fractions stacked-fractions", "stacked-fractions");
</del><ins>+runTest("font-variant-numeric", "lining-nums oldstyle-nums", "normal");
+runTest("font-variant-numeric", "proportional-nums tabular-nums", "normal");
+runTest("font-variant-numeric", "diagonal-fractions stacked-fractions", "normal");
</ins><span class="cx"> runTest("font-variant-numeric", "lining-nums proportional-nums", "lining-nums proportional-nums");
</span><span class="cx"> runTest("font-variant-numeric", "lining-nums diagonal-fractions", "lining-nums diagonal-fractions");
</span><span class="cx"> runTest("font-variant-numeric", "ordinal slashed-zero", "ordinal slashed-zero");
</span></span></pre></div>
<a id="trunkLayoutTestscss3supportscssomexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/supports-cssom-expected.txt (209508 => 209509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/supports-cssom-expected.txt 2016-12-08 01:49:40 UTC (rev 209508)
+++ trunk/LayoutTests/css3/supports-cssom-expected.txt 2016-12-08 02:01:30 UTC (rev 209509)
</span><span class="lines">@@ -29,11 +29,11 @@
</span><span class="cx">
</span><span class="cx"> @charset, @namespace, @import rules are not allowed inside @supports.
</span><span class="cx"> PASS rules[0].insertRule('@charset "UTF-8"', 2) threw exception SyntaxError (DOM Exception 12): The string did not match the expected pattern..
</span><del>-PASS rules[0].insertRule('@namespace ""', 2) threw exception SyntaxError (DOM Exception 12): The string did not match the expected pattern..
-PASS rules[0].insertRule('@import url("../fast/cssom/resources/import.css")', 2) threw exception SyntaxError (DOM Exception 12): The string did not match the expected pattern..
</del><ins>+PASS rules[0].insertRule('@namespace ""', 2) threw exception HierarchyRequestError (DOM Exception 3): The operation would yield an incorrect node tree..
+PASS rules[0].insertRule('@import url("../fast/cssom/resources/import.css")', 2) threw exception HierarchyRequestError (DOM Exception 3): The operation would yield an incorrect node tree..
</ins><span class="cx">
</span><span class="cx"> Whitespace and formatting should be preserved within the condition, whitespace outside the condition should be trimmed.
</span><del>-PASS rules[1].conditionText is "(( ( padding: 0) and (display: none)) or (display: rainbow))"
</del><ins>+PASS rules[1].conditionText is "(( ( padding: 0) and (display: none)) or (display: rainbow))"
</ins><span class="cx">
</span><span class="cx"> @supports rule nested inside a media rule.
</span><span class="cx"> PASS rules[2].type is CSSRule.MEDIA_RULE
</span></span></pre></div>
<a id="trunkLayoutTestscss3supportscssomhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/supports-cssom.html (209508 => 209509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/supports-cssom.html 2016-12-08 01:49:40 UTC (rev 209508)
+++ trunk/LayoutTests/css3/supports-cssom.html 2016-12-08 02:01:30 UTC (rev 209509)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> debug("\nWhitespace and formatting should be preserved within the condition, whitespace outside the condition should be trimmed.");
</span><del>- shouldBeEqualToString("rules[1].conditionText", "(( ( padding: 0) and (display: none)) or (display: rainbow))");
</del><ins>+ shouldBeEqualToString("rules[1].conditionText", "(( ( padding: 0) and (display: none)) or (display: rainbow))");
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> debug("\n@supports rule nested inside a media rule.");
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209508 => 209509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-08 01:49:40 UTC (rev 209508)
+++ trunk/Source/WebCore/ChangeLog 2016-12-08 02:01:30 UTC (rev 209509)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-12-07 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Stop skipping tests in the css3 LayoutTests subdirectory
+ https://bugs.webkit.org/show_bug.cgi?id=165574
+
+ Reviewed by Dean Jackson.
+
+ * css/CSSGroupingRule.cpp:
+ (WebCore::CSSGroupingRule::insertRule):
+ The old parser didn't support the creation of @namespace rules in the
+ CSS OM, but the new parser does. We need to ensure that just like for
+ @import rules, that the insertion of a @namespace rule inside a
+ @supports rule is not allowed. This test passed in the old parser because
+ the rule just didn't get created, but in the new parser, we need to
+ add a check along with the @import rule check to ensure it isn't allowed.
+
</ins><span class="cx"> 2016-12-07 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Remove aspect ratio button
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGroupingRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGroupingRule.cpp (209508 => 209509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGroupingRule.cpp 2016-12-08 01:49:40 UTC (rev 209508)
+++ trunk/Source/WebCore/css/CSSGroupingRule.cpp 2016-12-08 02:01:30 UTC (rev 209509)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> return Exception { SYNTAX_ERR };
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (newRule->isImportRule()) {
</del><ins>+ if (newRule->isImportRule() || newRule->isNamespaceRule()) {
</ins><span class="cx"> // FIXME: an HIERARCHY_REQUEST_ERR should also be thrown for a @charset or a nested
</span><span class="cx"> // @media rule. They are currently not getting parsed, resulting in a SYNTAX_ERR
</span><span class="cx"> // to get raised above.
</span></span></pre>
</div>
</div>
</body>
</html>