Title: [205621] releases/WebKitGTK/webkit-2.14/Source/WebCore
- Revision
- 205621
- Author
- [email protected]
- Date
- 2016-09-08 04:11:19 -0700 (Thu, 08 Sep 2016)
Log Message
Merge r205323 - Fix ENABLE(CSS_GRID_LAYOUT) guards harder after r205102/r205292
Unreviewed. Silence unused function warning.
* css/CSSComputedStyleDeclaration.cpp:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (205620 => 205621)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-09-08 11:11:11 UTC (rev 205620)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-09-08 11:11:19 UTC (rev 205621)
@@ -1,3 +1,11 @@
+2016-09-01 Michael Catanzaro <[email protected]>
+
+ Fix ENABLE(CSS_GRID_LAYOUT) guards harder after r205102/r205292
+
+ Unreviewed. Silence unused function warning.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+
2016-09-01 Javier Fernandez <[email protected]>
Unreviewed build fix after r205102.
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (205620 => 205621)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-09-08 11:11:11 UTC (rev 205620)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-09-08 11:11:19 UTC (rev 205621)
@@ -2286,6 +2286,7 @@
return &element;
}
+#if ENABLE(CSS_GRID_LAYOUT)
static StyleSelfAlignmentData resolveLegacyJustifyItems(const StyleSelfAlignmentData& data)
{
if (data.positionType() == LegacyPosition)
@@ -2293,7 +2294,6 @@
return data;
}
-#if ENABLE(CSS_GRID_LAYOUT)
static StyleSelfAlignmentData resolveJustifyItemsAuto(const StyleSelfAlignmentData& data, Node* parent)
{
if (data.position() != ItemPositionAuto)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
