Skip to content

Commit f207e66

Browse files
ylafonylafon
committed
1 parent e9bf6a3 commit f207e66

11 files changed

Lines changed: 72 additions & 28 deletions

‎org/w3c/css/properties/css3/CssScrollPadding.java‎

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.w3c.css.util.ApplContext;
1111
import org.w3c.css.util.InvalidParamException;
1212
import org.w3c.css.values.CssExpression;
13+
import org.w3c.css.values.CssIdent;
1314
import org.w3c.css.values.CssTypes;
1415
import org.w3c.css.values.CssValue;
1516
import org.w3c.css.values.CssValueList;
@@ -19,7 +20,7 @@
1920
import static org.w3c.css.values.CssOperator.SPACE;
2021

2122
/**
22-
* @spec https://www.w3.org/TR/2017/CR-css-scroll-snap-1-20170824/#propdef-scroll-padding
23+
* @spec https://www.w3.org/TR/2019/CR-css-scroll-snap-1-20190131/#propdef-scroll-padding
2324
*/
2425
public class CssScrollPadding extends org.w3c.css.properties.css.CssScrollPadding {
2526

@@ -28,6 +29,7 @@ public class CssScrollPadding extends org.w3c.css.properties.css.CssScrollPaddin
2829
private CssScrollPaddingBottom _longhand_bottom;
2930
private CssScrollPaddingLeft _longhand_left;
3031

32+
protected static CssIdent auto = CssIdent.getIdent("auto");
3133

3234
/**
3335
* Create a new CssScrollPaddingInline
@@ -74,22 +76,7 @@ public CssScrollPadding(ApplContext ac, CssExpression expression, boolean check)
7476
case CssTypes.CSS_PERCENTAGE:
7577
val.getCheckableValue().checkPositiveness(ac, this);
7678
values.add(val);
77-
switch (i) {
78-
case 0:
79-
_longhand_top.value = val;
80-
break;
81-
case 1:
82-
_longhand_right.value = val;
83-
break;
84-
case 2:
85-
_longhand_bottom.value = val;
86-
break;
87-
case 3:
88-
_longhand_left.value = val;
89-
break;
90-
default:
91-
// can't happen by design
92-
}
79+
setValue(i, val);
9380
break;
9481
case CssTypes.CSS_IDENT:
9582
if (inherit.equals(val)) {
@@ -105,6 +92,11 @@ public CssScrollPadding(ApplContext ac, CssExpression expression, boolean check)
10592
_longhand_left.value = inherit;
10693
break;
10794
}
95+
if (auto.equals(val)) {
96+
values.add(val);
97+
setValue(i, val);
98+
break;
99+
}
108100
default:
109101
throw new InvalidParamException("value",
110102
expression.getValue(),
@@ -119,6 +111,25 @@ public CssScrollPadding(ApplContext ac, CssExpression expression, boolean check)
119111
value = (values.size() == 1) ? values.get(0) : new CssValueList(values);
120112
}
121113

114+
private void setValue(int index, CssValue value) {
115+
switch (index) {
116+
case 0:
117+
_longhand_top.value = value;
118+
break;
119+
case 1:
120+
_longhand_right.value = value;
121+
break;
122+
case 2:
123+
_longhand_bottom.value = value;
124+
break;
125+
case 3:
126+
_longhand_left.value = value;
127+
break;
128+
default:
129+
// can't happen by design
130+
}
131+
}
132+
122133
public CssScrollPadding(ApplContext ac, CssExpression expression)
123134
throws InvalidParamException {
124135
this(ac, expression, false);
@@ -155,6 +166,10 @@ protected static CssValue checkPaddingValue(ApplContext ac, CssExpression expres
155166
expression.next();
156167
return inherit;
157168
}
169+
if (auto.equals(val)) {
170+
expression.next();
171+
return auto;
172+
}
158173
default:
159174
throw new InvalidParamException("value",
160175
expression.getValue(),

‎org/w3c/css/properties/css3/CssScrollPaddingBlock.java‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.w3c.css.util.ApplContext;
1010
import org.w3c.css.util.InvalidParamException;
1111
import org.w3c.css.values.CssExpression;
12+
import org.w3c.css.values.CssIdent;
1213
import org.w3c.css.values.CssTypes;
1314
import org.w3c.css.values.CssValue;
1415
import org.w3c.css.values.CssValueList;
@@ -18,13 +19,16 @@
1819
import static org.w3c.css.values.CssOperator.SPACE;
1920

2021
/**
21-
* @spec ttps://www.w3.org/TR/2017/CR-css-scroll-snap-1-20170824/#propdef-scroll-padding-block
22+
* @spec ttps://www.w3.org/TR/2019/CR-css-scroll-snap-1-20190131/#propdef-scroll-padding-block
2223
*/
2324
public class CssScrollPaddingBlock extends org.w3c.css.properties.css.CssScrollPaddingBlock {
2425

2526
private CssScrollPaddingBlockStart _longhand_start;
2627
private CssScrollPaddingBlockEnd _longhand_end;
2728

29+
protected static final CssIdent auto = CssIdent.getIdent("auto");
30+
31+
2832
/**
2933
* Create a new CssScrollPaddingBlock
3034
*/
@@ -75,6 +79,11 @@ public CssScrollPaddingBlock(ApplContext ac, CssExpression expression, boolean c
7579
_longhand_end.value = inherit;
7680
break;
7781
}
82+
if (auto.equals(val)) {
83+
values.add(auto);
84+
_longhand_start.value = auto;
85+
break;
86+
}
7887
default:
7988
throw new InvalidParamException("value",
8089
expression.getValue(),
@@ -96,6 +105,12 @@ public CssScrollPaddingBlock(ApplContext ac, CssExpression expression, boolean c
96105
values.add(val);
97106
_longhand_end.value = val;
98107
break;
108+
case CssTypes.CSS_IDENT:
109+
if (auto.equals(val)) {
110+
values.add(auto);
111+
_longhand_end.value = auto;
112+
break;
113+
}
99114
default:
100115
throw new InvalidParamException("value",
101116
expression.getValue(),

‎org/w3c/css/properties/css3/CssScrollPaddingBlockEnd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.w3c.css.values.CssExpression;
1111

1212
/**
13-
* @spec ttps://www.w3.org/TR/2017/CR-css-scroll-snap-1-20170824/#propdef-scroll-padding-block-end
13+
* @spec ttps://www.w3.org/TR/2019/CR-css-scroll-snap-1-20190131/#propdef-scroll-padding-block-end
1414
*/
1515
public class CssScrollPaddingBlockEnd extends org.w3c.css.properties.css.CssScrollPaddingBlockEnd {
1616

‎org/w3c/css/properties/css3/CssScrollPaddingBlockStart.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.w3c.css.values.CssExpression;
1111

1212
/**
13-
* @spec ttps://www.w3.org/TR/2017/CR-css-scroll-snap-1-20170824/#propdef-scroll-padding-block-start
13+
* @spec ttps://www.w3.org/TR/2019/CR-css-scroll-snap-1-20190131/#propdef-scroll-padding-block-start
1414
*/
1515
public class CssScrollPaddingBlockStart extends org.w3c.css.properties.css.CssScrollPaddingBlockStart {
1616

‎org/w3c/css/properties/css3/CssScrollPaddingBottom.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.w3c.css.values.CssExpression;
1111

1212
/**
13-
* @spec https://www.w3.org/TR/2017/CR-css-scroll-snap-1-20170824/#propdef-scroll-padding-bottom
13+
* @spec https://www.w3.org/TR/2019/CR-css-scroll-snap-1-20190131/#propdef-scroll-padding-bottom
1414
*/
1515
public class CssScrollPaddingBottom extends org.w3c.css.properties.css.CssScrollPaddingBottom {
1616

‎org/w3c/css/properties/css3/CssScrollPaddingInline.java‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.w3c.css.util.ApplContext;
1010
import org.w3c.css.util.InvalidParamException;
1111
import org.w3c.css.values.CssExpression;
12+
import org.w3c.css.values.CssIdent;
1213
import org.w3c.css.values.CssTypes;
1314
import org.w3c.css.values.CssValue;
1415
import org.w3c.css.values.CssValueList;
@@ -18,13 +19,15 @@
1819
import static org.w3c.css.values.CssOperator.SPACE;
1920

2021
/**
21-
* @spec https://www.w3.org/TR/2017/CR-css-scroll-snap-1-20170824/#propdef-scroll-padding-inline
22+
* @spec https://www.w3.org/TR/2019/CR-css-scroll-snap-1-20190131/#propdef-scroll-padding-inline
2223
*/
2324
public class CssScrollPaddingInline extends org.w3c.css.properties.css.CssScrollPaddingInline {
2425

2526
private CssScrollPaddingInlineStart _longhand_start;
2627
private CssScrollPaddingInlineEnd _longhand_end;
2728

29+
protected static final CssIdent auto = CssIdent.getIdent("auto");
30+
2831
/**
2932
* Create a new CssScrollPaddingInline
3033
*/
@@ -70,11 +73,16 @@ public CssScrollPaddingInline(ApplContext ac, CssExpression expression, boolean
7073
expression.getValue(),
7174
getPropertyName(), ac);
7275
}
73-
values.add(val);
76+
values.add(inherit);
7477
_longhand_start.value = inherit;
7578
_longhand_end.value = inherit;
7679
break;
7780
}
81+
if (auto.equals(val)) {
82+
values.add(auto);
83+
_longhand_start.value = auto;
84+
break;
85+
}
7886
default:
7987
throw new InvalidParamException("value",
8088
expression.getValue(),
@@ -96,6 +104,12 @@ public CssScrollPaddingInline(ApplContext ac, CssExpression expression, boolean
96104
values.add(val);
97105
_longhand_end.value = val;
98106
break;
107+
case CssTypes.CSS_IDENT:
108+
if (auto.equals(val)) {
109+
values.add(auto);
110+
_longhand_end.value = auto;
111+
break;
112+
}
99113
default:
100114
throw new InvalidParamException("value",
101115
expression.getValue(),

‎org/w3c/css/properties/css3/CssScrollPaddingInlineEnd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.w3c.css.values.CssExpression;
1111

1212
/**
13-
* @spec https://www.w3.org/TR/2017/CR-css-scroll-snap-1-20170824/#propdef-scroll-padding-inline-end
13+
* @spec https://www.w3.org/TR/2019/CR-css-scroll-snap-1-20190131/#propdef-scroll-padding-inline-end
1414
*/
1515
public class CssScrollPaddingInlineEnd extends org.w3c.css.properties.css.CssScrollPaddingInlineEnd {
1616

‎org/w3c/css/properties/css3/CssScrollPaddingInlineStart.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.w3c.css.values.CssExpression;
1111

1212
/**
13-
* @spec https://www.w3.org/TR/2017/CR-css-scroll-snap-1-20170824/#propdef-scroll-padding-inline-start
13+
* @spec https://www.w3.org/TR/2019/CR-css-scroll-snap-1-20190131/#propdef-scroll-padding-inline-start
1414
*/
1515
public class CssScrollPaddingInlineStart extends org.w3c.css.properties.css.CssScrollPaddingInlineStart {
1616

‎org/w3c/css/properties/css3/CssScrollPaddingLeft.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.w3c.css.values.CssExpression;
1111

1212
/**
13-
* @spec https://www.w3.org/TR/2017/CR-css-scroll-snap-1-20170824/#propdef-scroll-padding-left
13+
* @spec https://www.w3.org/TR/2019/CR-css-scroll-snap-1-20190131/#propdef-scroll-padding-left
1414
*/
1515
public class CssScrollPaddingLeft extends org.w3c.css.properties.css.CssScrollPaddingLeft {
1616

‎org/w3c/css/properties/css3/CssScrollPaddingRight.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.w3c.css.values.CssExpression;
1111

1212
/**
13-
* @spec https://www.w3.org/TR/2017/CR-css-scroll-snap-1-20170824/#propdef-scroll-padding-right
13+
* @spec https://www.w3.org/TR/2019/CR-css-scroll-snap-1-20190131/#propdef-scroll-padding-right
1414
*/
1515
public class CssScrollPaddingRight extends org.w3c.css.properties.css.CssScrollPaddingRight {
1616

0 commit comments

Comments
 (0)