Title: [205620] releases/WebKitGTK/webkit-2.14/Source/WebCore
- Revision
- 205620
- Author
- [email protected]
- Date
- 2016-09-08 04:11:11 -0700 (Thu, 08 Sep 2016)
Log Message
Merge r205292 - 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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (205619 => 205620)
--- 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)
@@ -1,3 +1,18 @@
+2016-09-01 Javier Fernandez <[email protected]>
+
+ 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):
+
2016-09-01 Fujii Hironori <[email protected]>
Fix the Mac cmake clean build issue
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (205619 => 205620)
--- 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)
@@ -312,8 +312,10 @@
CSSPropertyFlexDirection,
CSSPropertyFlexWrap,
CSSPropertyJustifyContent,
+#if ENABLE(CSS_GRID_LAYOUT)
CSSPropertyJustifySelf,
CSSPropertyJustifyItems,
+#endif
#if ENABLE(FILTERS_LEVEL_2)
CSSPropertyWebkitBackdropFilter,
#endif
@@ -2291,6 +2293,7 @@
return data;
}
+#if ENABLE(CSS_GRID_LAYOUT)
static StyleSelfAlignmentData resolveJustifyItemsAuto(const StyleSelfAlignmentData& data, Node* parent)
{
if (data.position() != ItemPositionAuto)
@@ -2315,6 +2318,7 @@
return { ItemPositionNormal, OverflowAlignmentDefault };
return resolveLegacyJustifyItems(resolveJustifyItemsAuto(parent->computedStyle()->justifyItems(), parent->parentNode()));
}
+#endif
static StyleSelfAlignmentData resolveAlignSelfAuto(const StyleSelfAlignmentData& data, Node* parent)
{
@@ -2830,10 +2834,12 @@
return cssValuePool.createValue(style->flexWrap());
case CSSPropertyJustifyContent:
return valueForContentPositionAndDistributionWithOverflowAlignment(style->justifyContent());
+#if ENABLE(CSS_GRID_LAYOUT)
case CSSPropertyJustifyItems:
return valueForItemPositionWithOverflowAlignment(resolveJustifyItemsAuto(style->justifyItems(), styledNode->parentNode()));
case CSSPropertyJustifySelf:
return valueForItemPositionWithOverflowAlignment(resolveJustifySelfAuto(style->justifySelf(), styledNode->parentNode()));
+#endif
case CSSPropertyOrder:
return cssValuePool.createValue(style->order(), CSSPrimitiveValue::CSS_NUMBER);
case CSSPropertyFloat:
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/css/CSSPropertyNames.in (205619 => 205620)
--- 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)
@@ -491,11 +491,11 @@
#if defined(ENABLE_FILTERS_LEVEL_2) && ENABLE_FILTERS_LEVEL_2
-webkit-backdrop-filter [ConditionalConverter=FilterOperations]
#endif
+-webkit-font-size-delta [SkipBuilder]
+#if defined(ENABLE_CSS_GRID_LAYOUT) && ENABLE_CSS_GRID_LAYOUT
justify-self [Initial=initialSelfAlignment, Converter=SelfOrDefaultAlignmentData]
--webkit-font-size-delta [SkipBuilder]
justify-items [Initial=initialSelfAlignment, Converter=SelfOrDefaultAlignmentData]
-webkit-justify-items = justify-items
-#if defined(ENABLE_CSS_GRID_LAYOUT) && ENABLE_CSS_GRID_LAYOUT
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]
grid-area [Longhands=grid-row-start|grid-column-start|grid-row-end|grid-column-end]
grid-auto-columns [Converter=GridTrackSizeList]
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/css/parser/CSSParser.cpp (205619 => 205620)
--- 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)
@@ -1157,7 +1157,11 @@
return true;
case CSSPropertyAlignItems:
case CSSPropertyAlignSelf:
+#if ENABLE(CSS_GRID_LAYOUT)
return !RuntimeEnabledFeatures::sharedFeatures().isCSSGridLayoutEnabled();
+#else
+ return true;
+#endif
default:
return false;
}
@@ -2737,16 +2741,18 @@
case CSSPropertyJustifyContent:
parsedValue = parseContentDistributionOverflowPosition();
break;
+#if ENABLE(CSS_GRID_LAYOUT)
case CSSPropertyJustifySelf:
- ASSERT(RuntimeEnabledFeatures::sharedFeatures().isCSSGridLayoutEnabled());
+ if (!isCSSGridLayoutEnabled())
+ return false;
return parseItemPositionOverflowPosition(propId, important);
case CSSPropertyJustifyItems:
- ASSERT(RuntimeEnabledFeatures::sharedFeatures().isCSSGridLayoutEnabled());
+ if (!isCSSGridLayoutEnabled())
+ return false;
if (parseLegacyPosition(propId, important))
return true;
m_valueList->setCurrentIndex(0);
return parseItemPositionOverflowPosition(propId, important);
-#if ENABLE(CSS_GRID_LAYOUT)
case CSSPropertyGridAutoColumns:
case CSSPropertyGridAutoRows:
if (!isCSSGridLayoutEnabled())
@@ -3159,6 +3165,7 @@
case CSSPropertyAlignContent:
parsedValue = parseContentDistributionOverflowPosition();
break;
+#if ENABLE(CSS_GRID_LAYOUT)
case CSSPropertyAlignSelf:
ASSERT(RuntimeEnabledFeatures::sharedFeatures().isCSSGridLayoutEnabled());
return parseItemPositionOverflowPosition(propId, important);
@@ -3166,6 +3173,7 @@
case CSSPropertyAlignItems:
ASSERT(RuntimeEnabledFeatures::sharedFeatures().isCSSGridLayoutEnabled());
return parseItemPositionOverflowPosition(propId, important);
+#endif
case CSSPropertyBorderBottomStyle:
case CSSPropertyBorderCollapse:
case CSSPropertyBorderLeftStyle:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
