<!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>[209239] 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/209239">209239</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-12-02 08:44:23 -0800 (Fri, 02 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Make sure margin and font set the implicit flag properly
https://bugs.webkit.org/show_bug.cgi?id=165306
Reviewed by Zalan Bujtas.
Source/WebCore:
* css/parser/CSSPropertyParser.cpp:
(WebCore::CSSPropertyParser::consumeFont):
(WebCore::CSSPropertyParser::consume4Values):
LayoutTests:
* TestExpectations:</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="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209238 => 209239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-02 16:32:10 UTC (rev 209238)
+++ trunk/LayoutTests/ChangeLog 2016-12-02 16:44:23 UTC (rev 209239)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-12-02 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Make sure margin and font set the implicit flag properly
+ https://bugs.webkit.org/show_bug.cgi?id=165306
+
+ Reviewed by Zalan Bujtas.
+
+ * TestExpectations:
+
</ins><span class="cx"> 2016-12-01 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Fade controls in when entering and exiting fullscreen
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (209238 => 209239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2016-12-02 16:32:10 UTC (rev 209238)
+++ trunk/LayoutTests/TestExpectations 2016-12-02 16:44:23 UTC (rev 209239)
</span><span class="lines">@@ -1009,6 +1009,7 @@
</span><span class="cx"> webkit.org/b/165195 fast/events/mouse-cursor.html [ Pass Failure ]
</span><span class="cx"> webkit.org/b/165195 fast/forms/basic-selects.html [ Pass Failure ]
</span><span class="cx"> webkit.org/b/165195 fast/shadow-dom/slotted-pseudo-element-css-text.html [ Pass Failure ]
</span><ins>+webkit.org/b/165195 fast/inspector-support/style.html [ Pass Failure ]
</ins><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></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209238 => 209239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-02 16:32:10 UTC (rev 209238)
+++ trunk/Source/WebCore/ChangeLog 2016-12-02 16:44:23 UTC (rev 209239)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-12-02 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><ins>+ [CSS Parser] Make sure margin and font set the implicit flag properly
+ https://bugs.webkit.org/show_bug.cgi?id=165306
+
+ Reviewed by Zalan Bujtas.
+
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::CSSPropertyParser::consumeFont):
+ (WebCore::CSSPropertyParser::consume4Values):
+
+2016-12-02 Dave Hyatt <hyatt@apple.com>
+
</ins><span class="cx"> [CSS Parser] Make sure the templatized consumeIdent uses CSSValuePool
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=165302
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (209238 => 209239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-12-02 16:32:10 UTC (rev 209238)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-12-02 16:44:23 UTC (rev 209239)
</span><span class="lines">@@ -4233,17 +4233,17 @@
</span><span class="cx"> if (m_range.atEnd())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- addProperty(CSSPropertyFontStyle, CSSPropertyFont, fontStyle ? fontStyle.releaseNonNull() : CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
- addProperty(CSSPropertyFontVariantCaps, CSSPropertyFont, fontVariantCaps ? fontVariantCaps.releaseNonNull() : CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
</del><ins>+ addProperty(CSSPropertyFontStyle, CSSPropertyFont, fontStyle ? fontStyle.releaseNonNull() : CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, !fontStyle);
+ addProperty(CSSPropertyFontVariantCaps, CSSPropertyFont, fontVariantCaps ? fontVariantCaps.releaseNonNull() : CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, !fontVariantCaps);
</ins><span class="cx"> /*
</span><span class="cx"> // FIXME-NEWPARSER: What do we do with these? They aren't part of our fontShorthand().
</span><del>- addProperty(CSSPropertyFontVariantLigatures, CSSPropertyFont, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
- addProperty(CSSPropertyFontVariantNumeric, CSSPropertyFont, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
</del><ins>+ addProperty(CSSPropertyFontVariantLigatures, CSSPropertyFont, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, true);
+ addProperty(CSSPropertyFontVariantNumeric, CSSPropertyFont, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, true);
</ins><span class="cx"> */
</span><span class="cx">
</span><del>- addProperty(CSSPropertyFontWeight, CSSPropertyFont, fontWeight ? fontWeight.releaseNonNull() : CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
</del><ins>+ addProperty(CSSPropertyFontWeight, CSSPropertyFont, fontWeight ? fontWeight.releaseNonNull() : CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, !fontWeight);
</ins><span class="cx"> /* FIXME-NEWPARSER: Implement.
</span><del>- addProperty(CSSPropertyFontStretch, CSSPropertyFont, fontStretch ? fontStretch.releaseNonNull() : CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
</del><ins>+ addProperty(CSSPropertyFontStretch, CSSPropertyFont, fontStretch ? fontStretch.releaseNonNull() : CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, !fontStretch);
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> // Now a font size _must_ come.
</span><span class="lines">@@ -4259,7 +4259,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> addProperty(CSSPropertyLineHeight, CSSPropertyFont, lineHeight.releaseNonNull(), important);
</span><span class="cx"> } else {
</span><del>- addProperty(CSSPropertyLineHeight, CSSPropertyFont, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
</del><ins>+ addProperty(CSSPropertyLineHeight, CSSPropertyFont, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Font family must come now.
</span><span class="lines">@@ -4633,6 +4633,10 @@
</span><span class="cx"> left = parseSingleValue(longhands[3], shorthand.id());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool rightImplicit = !right;
+ bool bottomImplicit = !bottom;
+ bool leftImplicit = !left;
+
</ins><span class="cx"> if (!right)
</span><span class="cx"> right = top;
</span><span class="cx"> if (!bottom)
</span><span class="lines">@@ -4641,9 +4645,9 @@
</span><span class="cx"> left = right;
</span><span class="cx">
</span><span class="cx"> addProperty(longhands[0], shorthand.id(), top.releaseNonNull(), important);
</span><del>- addProperty(longhands[1], shorthand.id(), right.releaseNonNull(), important);
- addProperty(longhands[2], shorthand.id(), bottom.releaseNonNull(), important);
- addProperty(longhands[3], shorthand.id(), left.releaseNonNull(), important);
</del><ins>+ addProperty(longhands[1], shorthand.id(), right.releaseNonNull(), important, rightImplicit);
+ addProperty(longhands[2], shorthand.id(), bottom.releaseNonNull(), important, bottomImplicit);
+ addProperty(longhands[3], shorthand.id(), left.releaseNonNull(), important, leftImplicit);
</ins><span class="cx">
</span><span class="cx"> return m_range.atEnd();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>