Diff
Modified: trunk/LayoutTests/ChangeLog (197021 => 197022)
--- trunk/LayoutTests/ChangeLog 2016-02-24 09:36:12 UTC (rev 197021)
+++ trunk/LayoutTests/ChangeLog 2016-02-24 10:03:25 UTC (rev 197022)
@@ -1,3 +1,13 @@
+2016-02-23 Sergio Villar Senin <svil...@igalia.com>
+
+ [css-grid] Swap the order of columns/rows in grid-gap shorthand
+ https://bugs.webkit.org/show_bug.cgi?id=154584
+
+ Reviewed by Darin Adler.
+
+ * fast/css-grid-layout/grid-gutters-get-set-expected.txt:
+ * fast/css-grid-layout/grid-gutters-get-set.html:
+
2016-02-24 Adam Bergkvist <adam.bergkv...@ericsson.com>
WebRTC: RTCPeerConnection: Sort out responsibilities of close() and stop()
Modified: trunk/LayoutTests/fast/css-grid-layout/grid-gutters-get-set-expected.txt (197021 => 197022)
--- trunk/LayoutTests/fast/css-grid-layout/grid-gutters-get-set-expected.txt 2016-02-24 09:36:12 UTC (rev 197021)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-gutters-get-set-expected.txt 2016-02-24 10:03:25 UTC (rev 197022)
@@ -6,8 +6,10 @@
Test getting grid-column-gap and grid-row-gap set through CSS
PASS window.getComputedStyle(defaultGrid, '').getPropertyValue('-webkit-grid-row-gap') is "0px"
PASS window.getComputedStyle(defaultGrid, '').getPropertyValue('-webkit-grid-column-gap') is "0px"
-PASS window.getComputedStyle(gridGap, '').getPropertyValue('-webkit-grid-row-gap') is "25px"
-PASS window.getComputedStyle(gridGap, '').getPropertyValue('-webkit-grid-column-gap') is "25px"
+PASS window.getComputedStyle(gridGap, '').getPropertyValue('-webkit-grid-row-gap') is "20px"
+PASS window.getComputedStyle(gridGap, '').getPropertyValue('-webkit-grid-column-gap') is "15px"
+PASS window.getComputedStyle(gridSimpleGap, '').getPropertyValue('-webkit-grid-row-gap') is "25px"
+PASS window.getComputedStyle(gridSimpleGap, '').getPropertyValue('-webkit-grid-column-gap') is "25px"
PASS window.getComputedStyle(gridColumnGap, '').getPropertyValue('-webkit-grid-row-gap') is "0px"
PASS window.getComputedStyle(gridColumnGap, '').getPropertyValue('-webkit-grid-column-gap') is "16px"
PASS window.getComputedStyle(gridRowGap, '').getPropertyValue('-webkit-grid-row-gap') is "32px"
Modified: trunk/LayoutTests/fast/css-grid-layout/grid-gutters-get-set.html (197021 => 197022)
--- trunk/LayoutTests/fast/css-grid-layout/grid-gutters-get-set.html 2016-02-24 09:36:12 UTC (rev 197021)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-gutters-get-set.html 2016-02-24 10:03:25 UTC (rev 197022)
@@ -3,7 +3,8 @@
<head>
<link href="" rel="stylesheet">
<style>
-.gridGap { -webkit-grid-gap: 25px; }
+.gridGap { -webkit-grid-gap: 20px 15px; }
+.gridSimpleGap { -webkit-grid-gap: 25px; }
.gridColumnGap { -webkit-grid-column-gap: 2vw; }
.gridRowGap { -webkit-grid-row-gap: 2em; }
.gridRowColumnGaps {
@@ -43,14 +44,15 @@
<div class="grid" id="defaultGrid"></div>
<div class="grid gridGap" id="gridGap"></div>
+<div class="grid gridSimpleGap" id="gridSimpleGap"></div>
<div class="grid gridColumnGap" id="gridColumnGap"></div>
<div class="grid gridRowGap" id="gridRowGap"></div>
<div class="grid gridCalcGaps" id="gridCalcGaps"></div>
<div class="grid gridRowColumnGaps" id="gridRowColumnGaps"></div>
-<div class="grid gridGap">
+<div class="grid gridSimpleGap">
<div class="grid gridRowColumnInheritGaps" id="gridRowColumnInheritGaps"></div>
</div>
-<div class="grid gridGap">
+<div class="grid gridSimpleGap">
<div class="grid gridRowColumnInitialGaps" id="gridRowColumnInitialGaps"></div>
</div>
<div class="grid gridInvalidRowGap" id="gridInvalidRowGap"></div>
@@ -69,7 +71,8 @@
debug("Test getting grid-column-gap and grid-row-gap set through CSS");
testGridGapDefinitionsValues("defaultGrid", "0px", "0px");
-testGridGapDefinitionsValues("gridGap", "25px", "25px");
+testGridGapDefinitionsValues("gridGap", "20px", "15px");
+testGridGapDefinitionsValues("gridSimpleGap", "25px", "25px");
testGridGapDefinitionsValues("gridColumnGap", "0px", "16px");
testGridGapDefinitionsValues("gridRowGap", "32px", "0px");
testGridGapDefinitionsValues("gridCalcGaps", "13px", "10px");
Modified: trunk/Source/WebCore/ChangeLog (197021 => 197022)
--- trunk/Source/WebCore/ChangeLog 2016-02-24 09:36:12 UTC (rev 197021)
+++ trunk/Source/WebCore/ChangeLog 2016-02-24 10:03:25 UTC (rev 197022)
@@ -1,3 +1,17 @@
+2016-02-23 Sergio Villar Senin <svil...@igalia.com>
+
+ [css-grid] Swap the order of columns/rows in grid-gap shorthand
+ https://bugs.webkit.org/show_bug.cgi?id=154584
+
+ The latest editor's draft have just changed the order. Now it
+ should be <grid-row-gap> <grid-column-gap>?.
+
+ Reviewed by Darin Adler.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseGridGapShorthand):
+ * css/CSSPropertyNames.in:
+
2016-02-24 Ryosuke Niwa <rn...@webkit.org>
Move FocusNavigationScope into FocusController.cpp
Modified: trunk/Source/WebCore/css/CSSParser.cpp (197021 => 197022)
--- trunk/Source/WebCore/css/CSSParser.cpp 2016-02-24 09:36:12 UTC (rev 197021)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-02-24 10:03:25 UTC (rev 197022)
@@ -5537,30 +5537,30 @@
if (!value)
return false;
- ValueWithCalculation columnValueWithCalculation(*value);
- if (!validateUnit(columnValueWithCalculation, FLength | FNonNeg))
+ ValueWithCalculation rowValueWithCalculation(*value);
+ if (!validateUnit(rowValueWithCalculation, FLength | FNonNeg))
return false;
- RefPtr<CSSPrimitiveValue> columnGap = createPrimitiveNumericValue(columnValueWithCalculation);
+ RefPtr<CSSPrimitiveValue> rowGap = createPrimitiveNumericValue(rowValueWithCalculation);
value = m_valueList->next();
if (!value) {
- addProperty(CSSPropertyWebkitGridColumnGap, columnGap, important);
- addProperty(CSSPropertyWebkitGridRowGap, columnGap, important);
+ addProperty(CSSPropertyWebkitGridColumnGap, rowGap, important);
+ addProperty(CSSPropertyWebkitGridRowGap, rowGap, important);
return true;
}
- ValueWithCalculation rowValueWithCalculation(*value);
- if (!validateUnit(rowValueWithCalculation, FLength | FNonNeg))
+ ValueWithCalculation columnValueWithCalculation(*value);
+ if (!validateUnit(columnValueWithCalculation, FLength | FNonNeg))
return false;
if (m_valueList->next())
return false;
- RefPtr<CSSPrimitiveValue> rowGap = createPrimitiveNumericValue(rowValueWithCalculation);
+ RefPtr<CSSPrimitiveValue> columnGap = createPrimitiveNumericValue(columnValueWithCalculation);
+ addProperty(CSSPropertyWebkitGridRowGap, rowGap, important);
addProperty(CSSPropertyWebkitGridColumnGap, columnGap, important);
- addProperty(CSSPropertyWebkitGridRowGap, rowGap, important);
return true;
}
Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (197021 => 197022)
--- trunk/Source/WebCore/css/CSSPropertyNames.in 2016-02-24 09:36:12 UTC (rev 197021)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2016-02-24 10:03:25 UTC (rev 197022)
@@ -509,7 +509,7 @@
-webkit-grid-row-gap [Initial=initialZeroLength, Converter=Length]
-webkit-grid-row-start [ConditionalConverter=GridPosition, NameForMethods=GridItemRowStart]
-webkit-grid-column [Longhands=-webkit-grid-column-start|-webkit-grid-column-end]
--webkit-grid-gap [Longhands=-webkit-grid-column-gap|-webkit-grid-row-gap]
+-webkit-grid-gap [Longhands=-webkit-grid-row-gap|-webkit-grid-column-gap]
-webkit-grid-row [Longhands=-webkit-grid-row-start|-webkit-grid-row-end]
-webkit-grid-template-areas [Custom=All]
-webkit-grid-auto-flow [Converter=GridAutoFlow]
