<!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>[205620] releases/WebKitGTK/webkit-2.14/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/205620">205620</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-08 04:11:11 -0700 (Thu, 08 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/205292">r205292</a> - Unreviewed build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/205102">r205102</a>.
The change made in <a href="http://trac.webkit.org/projects/webkit/changeset/205102">r205102</a> caused compilation failures on
builds with the CSS_GRID_LAYOUT compilation flag disabled.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
(WebCore::resolveJustifySelfAuto): Deleted.
* css/CSSPropertyNames.in:
* css/parser/CSSParser.cpp:
(WebCore::isKeywordPropertyID):
(WebCore::CSSParser::parseValue):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorecssCSSComputedStyleDeclarationcpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorecssCSSPropertyNamesin">releases/WebKitGTK/webkit-2.14/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorecssparserCSSParsercpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/css/parser/CSSParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (205619 => 205620)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-09-08 10:55:40 UTC (rev 205619)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-09-08 11:11:11 UTC (rev 205620)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-09-01 Javier Fernandez <jfernandez@igalia.com>
+
+ Unreviewed build fix after r205102.
+
+ The change made in r205102 caused compilation failures on
+ builds with the CSS_GRID_LAYOUT compilation flag disabled.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ (WebCore::resolveJustifySelfAuto): Deleted.
+ * css/CSSPropertyNames.in:
+ * css/parser/CSSParser.cpp:
+ (WebCore::isKeywordPropertyID):
+ (WebCore::CSSParser::parseValue):
+
</ins><span class="cx"> 2016-09-01 Fujii Hironori <Hironori.Fujii@sony.com>
</span><span class="cx">
</span><span class="cx"> Fix the Mac cmake clean build issue
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (205619 => 205620)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-09-08 10:55:40 UTC (rev 205619)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-09-08 11:11:11 UTC (rev 205620)
</span><span class="lines">@@ -312,8 +312,10 @@
</span><span class="cx"> CSSPropertyFlexDirection,
</span><span class="cx"> CSSPropertyFlexWrap,
</span><span class="cx"> CSSPropertyJustifyContent,
</span><ins>+#if ENABLE(CSS_GRID_LAYOUT)
</ins><span class="cx"> CSSPropertyJustifySelf,
</span><span class="cx"> CSSPropertyJustifyItems,
</span><ins>+#endif
</ins><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> CSSPropertyWebkitBackdropFilter,
</span><span class="cx"> #endif
</span><span class="lines">@@ -2291,6 +2293,7 @@
</span><span class="cx"> return data;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_GRID_LAYOUT)
</ins><span class="cx"> static StyleSelfAlignmentData resolveJustifyItemsAuto(const StyleSelfAlignmentData& data, Node* parent)
</span><span class="cx"> {
</span><span class="cx"> if (data.position() != ItemPositionAuto)
</span><span class="lines">@@ -2315,6 +2318,7 @@
</span><span class="cx"> return { ItemPositionNormal, OverflowAlignmentDefault };
</span><span class="cx"> return resolveLegacyJustifyItems(resolveJustifyItemsAuto(parent->computedStyle()->justifyItems(), parent->parentNode()));
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> static StyleSelfAlignmentData resolveAlignSelfAuto(const StyleSelfAlignmentData& data, Node* parent)
</span><span class="cx"> {
</span><span class="lines">@@ -2830,10 +2834,12 @@
</span><span class="cx"> return cssValuePool.createValue(style->flexWrap());
</span><span class="cx"> case CSSPropertyJustifyContent:
</span><span class="cx"> return valueForContentPositionAndDistributionWithOverflowAlignment(style->justifyContent());
</span><ins>+#if ENABLE(CSS_GRID_LAYOUT)
</ins><span class="cx"> case CSSPropertyJustifyItems:
</span><span class="cx"> return valueForItemPositionWithOverflowAlignment(resolveJustifyItemsAuto(style->justifyItems(), styledNode->parentNode()));
</span><span class="cx"> case CSSPropertyJustifySelf:
</span><span class="cx"> return valueForItemPositionWithOverflowAlignment(resolveJustifySelfAuto(style->justifySelf(), styledNode->parentNode()));
</span><ins>+#endif
</ins><span class="cx"> case CSSPropertyOrder:
</span><span class="cx"> return cssValuePool.createValue(style->order(), CSSPrimitiveValue::CSS_NUMBER);
</span><span class="cx"> case CSSPropertyFloat:
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/css/CSSPropertyNames.in (205619 => 205620)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/css/CSSPropertyNames.in 2016-09-08 10:55:40 UTC (rev 205619)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/css/CSSPropertyNames.in 2016-09-08 11:11:11 UTC (rev 205620)
</span><span class="lines">@@ -491,11 +491,11 @@
</span><span class="cx"> #if defined(ENABLE_FILTERS_LEVEL_2) && ENABLE_FILTERS_LEVEL_2
</span><span class="cx"> -webkit-backdrop-filter [ConditionalConverter=FilterOperations]
</span><span class="cx"> #endif
</span><ins>+-webkit-font-size-delta [SkipBuilder]
+#if defined(ENABLE_CSS_GRID_LAYOUT) && ENABLE_CSS_GRID_LAYOUT
</ins><span class="cx"> justify-self [Initial=initialSelfAlignment, Converter=SelfOrDefaultAlignmentData]
</span><del>--webkit-font-size-delta [SkipBuilder]
</del><span class="cx"> justify-items [Initial=initialSelfAlignment, Converter=SelfOrDefaultAlignmentData]
</span><span class="cx"> -webkit-justify-items = justify-items
</span><del>-#if defined(ENABLE_CSS_GRID_LAYOUT) && ENABLE_CSS_GRID_LAYOUT
</del><span class="cx"> grid [Longhands=grid-template-rows|grid-template-columns|grid-template-areas|grid-auto-flow|grid-auto-rows|grid-auto-columns|grid-column-gap|grid-row-gap]
</span><span class="cx"> grid-area [Longhands=grid-row-start|grid-column-start|grid-row-end|grid-column-end]
</span><span class="cx"> grid-auto-columns [Converter=GridTrackSizeList]
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorecssparserCSSParsercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/css/parser/CSSParser.cpp (205619 => 205620)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/css/parser/CSSParser.cpp 2016-09-08 10:55:40 UTC (rev 205619)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/css/parser/CSSParser.cpp 2016-09-08 11:11:11 UTC (rev 205620)
</span><span class="lines">@@ -1157,7 +1157,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> case CSSPropertyAlignItems:
</span><span class="cx"> case CSSPropertyAlignSelf:
</span><ins>+#if ENABLE(CSS_GRID_LAYOUT)
</ins><span class="cx"> return !RuntimeEnabledFeatures::sharedFeatures().isCSSGridLayoutEnabled();
</span><ins>+#else
+ return true;
+#endif
</ins><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -2737,16 +2741,18 @@
</span><span class="cx"> case CSSPropertyJustifyContent:
</span><span class="cx"> parsedValue = parseContentDistributionOverflowPosition();
</span><span class="cx"> break;
</span><ins>+#if ENABLE(CSS_GRID_LAYOUT)
</ins><span class="cx"> case CSSPropertyJustifySelf:
</span><del>- ASSERT(RuntimeEnabledFeatures::sharedFeatures().isCSSGridLayoutEnabled());
</del><ins>+ if (!isCSSGridLayoutEnabled())
+ return false;
</ins><span class="cx"> return parseItemPositionOverflowPosition(propId, important);
</span><span class="cx"> case CSSPropertyJustifyItems:
</span><del>- ASSERT(RuntimeEnabledFeatures::sharedFeatures().isCSSGridLayoutEnabled());
</del><ins>+ if (!isCSSGridLayoutEnabled())
+ return false;
</ins><span class="cx"> if (parseLegacyPosition(propId, important))
</span><span class="cx"> return true;
</span><span class="cx"> m_valueList->setCurrentIndex(0);
</span><span class="cx"> return parseItemPositionOverflowPosition(propId, important);
</span><del>-#if ENABLE(CSS_GRID_LAYOUT)
</del><span class="cx"> case CSSPropertyGridAutoColumns:
</span><span class="cx"> case CSSPropertyGridAutoRows:
</span><span class="cx"> if (!isCSSGridLayoutEnabled())
</span><span class="lines">@@ -3159,6 +3165,7 @@
</span><span class="cx"> case CSSPropertyAlignContent:
</span><span class="cx"> parsedValue = parseContentDistributionOverflowPosition();
</span><span class="cx"> break;
</span><ins>+#if ENABLE(CSS_GRID_LAYOUT)
</ins><span class="cx"> case CSSPropertyAlignSelf:
</span><span class="cx"> ASSERT(RuntimeEnabledFeatures::sharedFeatures().isCSSGridLayoutEnabled());
</span><span class="cx"> return parseItemPositionOverflowPosition(propId, important);
</span><span class="lines">@@ -3166,6 +3173,7 @@
</span><span class="cx"> case CSSPropertyAlignItems:
</span><span class="cx"> ASSERT(RuntimeEnabledFeatures::sharedFeatures().isCSSGridLayoutEnabled());
</span><span class="cx"> return parseItemPositionOverflowPosition(propId, important);
</span><ins>+#endif
</ins><span class="cx"> case CSSPropertyBorderBottomStyle:
</span><span class="cx"> case CSSPropertyBorderCollapse:
</span><span class="cx"> case CSSPropertyBorderLeftStyle:
</span></span></pre>
</div>
</div>
</body>
</html>