Skip to content

Commit 15535f3

Browse files
idealismsidealisms
committed
rename display:-webkit-flexbox to display:-webkit-flex
https://bugs.webkit.org/show_bug.cgi?id=86529 Reviewed by Eric Seidel. Source/WebCore: Also renames -webkit-inline-flexbox to -webkit-inline-flex. No new tests. Covered by existing tests. * css/CSSParser.cpp: (WebCore::isValidKeywordPropertyAndValue): * css/CSSPrimitiveValueMappings.h: (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): * css/CSSValueKeywords.in: Update keyword values. * css/StyleResolver.cpp: (WebCore::StyleResolver::collectMatchingRulesForList): * rendering/RenderObject.cpp: (WebCore::RenderObject::createObject): * rendering/RenderObject.h: (RenderObject): * rendering/style/RenderStyleConstants.h: Rename const values. LayoutTests: * css3/flexbox/anonymous-block-merge-crash.html: * css3/flexbox/anonymous-block.html: * css3/flexbox/auto-height-dynamic.html: * css3/flexbox/child-overflow.html: * css3/flexbox/columns-auto-size.html: * css3/flexbox/cross-axis-scrollbar.html: * css3/flexbox/css-properties-expected.txt: * css3/flexbox/css-properties.html: * css3/flexbox/display-flexbox-set-get-expected.txt: * css3/flexbox/display-flexbox-set-get.html: * css3/flexbox/flex-algorithm-min-max.html: * css3/flexbox/flex-algorithm-with-margins.html: * css3/flexbox/flex-algorithm.html: * css3/flexbox/flex-align-baseline.html: * css3/flexbox/flex-align-column.html: * css3/flexbox/flex-align-end.html: * css3/flexbox/flex-align-max.html: * css3/flexbox/flex-align-percent-height.html: * css3/flexbox/flex-align-stretch.html: * css3/flexbox/flex-align-vertical-writing-mode.html: * css3/flexbox/flex-align.html: * css3/flexbox/flex-flow-border.html: * css3/flexbox/flex-flow-margins-auto-size.html: * css3/flexbox/flex-flow-margins.html: * css3/flexbox/flex-flow-orientations.html: * css3/flexbox/flex-flow-overflow.html: * css3/flexbox/flex-flow-padding.html: * css3/flexbox/flex-flow.html: * css3/flexbox/flex-item-child-overflow.html: * css3/flexbox/flex-no-flex.html: * css3/flexbox/flex-order.html: * css3/flexbox/flex-pack.html: * css3/flexbox/flexbox-overflow-auto-expected.html: * css3/flexbox/flexbox-overflow-auto.html: * css3/flexbox/floated-flexbox.html: * css3/flexbox/insert-text-crash.html: * css3/flexbox/line-wrapping.html: * css3/flexbox/multiline-align.html: * css3/flexbox/multiline-column-auto.html: * css3/flexbox/multiline-line-pack-horizontal-column.html: * css3/flexbox/multiline-line-pack.html: * css3/flexbox/multiline-pack.html: * css3/flexbox/multiline-reverse-wrap-baseline.html: * css3/flexbox/multiline-reverse-wrap-overflow.html: * css3/flexbox/multiline-shrink-to-fit.html: * css3/flexbox/multiline.html: * css3/flexbox/nested-stretch.html: * css3/flexbox/orthogonal-flex-directions.html: * css3/flexbox/position-absolute-child.html: * css3/flexbox/preferred-widths-orthogonal.html: * css3/flexbox/preferred-widths.html: * css3/flexbox/repaint-rtl-column.html: * css3/flexbox/repaint.html: * css3/flexbox/true-centering.html: * css3/flexbox/writing-modes.html: Canonical link: https://commits.webkit.org/104295@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@117385 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 0412167 commit 15535f3

65 files changed

Lines changed: 211 additions & 124 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎LayoutTests/ChangeLog‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,66 @@
1+
2012-05-16 Tony Chang <tony@chromium.org>
2+
3+
rename display:-webkit-flexbox to display:-webkit-flex
4+
https://bugs.webkit.org/show_bug.cgi?id=86529
5+
6+
Reviewed by Eric Seidel.
7+
8+
* css3/flexbox/anonymous-block-merge-crash.html:
9+
* css3/flexbox/anonymous-block.html:
10+
* css3/flexbox/auto-height-dynamic.html:
11+
* css3/flexbox/child-overflow.html:
12+
* css3/flexbox/columns-auto-size.html:
13+
* css3/flexbox/cross-axis-scrollbar.html:
14+
* css3/flexbox/css-properties-expected.txt:
15+
* css3/flexbox/css-properties.html:
16+
* css3/flexbox/display-flexbox-set-get-expected.txt:
17+
* css3/flexbox/display-flexbox-set-get.html:
18+
* css3/flexbox/flex-algorithm-min-max.html:
19+
* css3/flexbox/flex-algorithm-with-margins.html:
20+
* css3/flexbox/flex-algorithm.html:
21+
* css3/flexbox/flex-align-baseline.html:
22+
* css3/flexbox/flex-align-column.html:
23+
* css3/flexbox/flex-align-end.html:
24+
* css3/flexbox/flex-align-max.html:
25+
* css3/flexbox/flex-align-percent-height.html:
26+
* css3/flexbox/flex-align-stretch.html:
27+
* css3/flexbox/flex-align-vertical-writing-mode.html:
28+
* css3/flexbox/flex-align.html:
29+
* css3/flexbox/flex-flow-border.html:
30+
* css3/flexbox/flex-flow-margins-auto-size.html:
31+
* css3/flexbox/flex-flow-margins.html:
32+
* css3/flexbox/flex-flow-orientations.html:
33+
* css3/flexbox/flex-flow-overflow.html:
34+
* css3/flexbox/flex-flow-padding.html:
35+
* css3/flexbox/flex-flow.html:
36+
* css3/flexbox/flex-item-child-overflow.html:
37+
* css3/flexbox/flex-no-flex.html:
38+
* css3/flexbox/flex-order.html:
39+
* css3/flexbox/flex-pack.html:
40+
* css3/flexbox/flexbox-overflow-auto-expected.html:
41+
* css3/flexbox/flexbox-overflow-auto.html:
42+
* css3/flexbox/floated-flexbox.html:
43+
* css3/flexbox/insert-text-crash.html:
44+
* css3/flexbox/line-wrapping.html:
45+
* css3/flexbox/multiline-align.html:
46+
* css3/flexbox/multiline-column-auto.html:
47+
* css3/flexbox/multiline-line-pack-horizontal-column.html:
48+
* css3/flexbox/multiline-line-pack.html:
49+
* css3/flexbox/multiline-pack.html:
50+
* css3/flexbox/multiline-reverse-wrap-baseline.html:
51+
* css3/flexbox/multiline-reverse-wrap-overflow.html:
52+
* css3/flexbox/multiline-shrink-to-fit.html:
53+
* css3/flexbox/multiline.html:
54+
* css3/flexbox/nested-stretch.html:
55+
* css3/flexbox/orthogonal-flex-directions.html:
56+
* css3/flexbox/position-absolute-child.html:
57+
* css3/flexbox/preferred-widths-orthogonal.html:
58+
* css3/flexbox/preferred-widths.html:
59+
* css3/flexbox/repaint-rtl-column.html:
60+
* css3/flexbox/repaint.html:
61+
* css3/flexbox/true-centering.html:
62+
* css3/flexbox/writing-modes.html:
63+
164
2012-05-16 Chris Rogers <crogers@google.com>
265

366
AudioParam must support fan-in (multiple audio connections)

‎LayoutTests/css3/flexbox/anonymous-block-merge-crash.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div style="display:-webkit-flexbox"><div id="inner"></div>If this page doesn't crash then this test passes.</div>
1+
<div style="display:-webkit-flex"><div id="inner"></div>If this page doesn't crash then this test passes.</div>
22
<script>
33
if (window.layoutTestController)
44
layoutTestController.dumpAsText()

‎LayoutTests/css3/flexbox/anonymous-block.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE html>
22
<html>
33
<body>
4-
<div style="display: -webkit-flexbox">This text should be visible.</div>
4+
<div style="display: -webkit-flex">This text should be visible.</div>
55
</body>
66
</html>

‎LayoutTests/css3/flexbox/auto-height-dynamic.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<style>
44
.flexbox {
55
width: 600px;
6-
display: -webkit-flexbox;
6+
display: -webkit-flex;
77
background-color: #aaa;
88
position: relative;
99
-webkit-flex-flow: column;

‎LayoutTests/css3/flexbox/child-overflow.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
.flexbox {
4343
border: 5px solid pink;
44-
display: -webkit-flexbox;
44+
display: -webkit-flex;
4545
height: 100px;
4646
width: 100px;
4747
}

‎LayoutTests/css3/flexbox/columns-auto-size.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
}
77

88
.flexbox {
9-
display: -webkit-flexbox;
9+
display: -webkit-flex;
1010
-webkit-flex-flow: column;
1111
background-color: #aaa;
1212
position: relative;

‎LayoutTests/css3/flexbox/cross-axis-scrollbar.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
}
88

99
.flexbox {
10-
display: -webkit-flexbox;
10+
display: -webkit-flex;
1111
background-color: red;
1212
}
1313

‎LayoutTests/css3/flexbox/css-properties-expected.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
Tests being able to set the display to -webkit-flexbox and -webkit-inline-flexbox.
1+
Tests being able to set the display to -webkit-flex and -webkit-inline-flex.
22

33
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
44

55

6-
PASS flexbox.style.display is "-webkit-flexbox"
6+
PASS flexbox.style.display is "-webkit-flex"
77
PASS flexbox.style.display is "inline"
8-
PASS flexbox.style.display is "-webkit-inline-flexbox"
9-
PASS flexbox.style.display is "-webkit-inline-flexbox"
8+
PASS flexbox.style.display is "-webkit-inline-flex"
9+
PASS flexbox.style.display is "-webkit-inline-flex"
1010
PASS flexbox.style.display is "block"
1111
PASS flexitem.style.webkitFlexOrder is ""
1212
PASS flexitem.style.webkitFlexOrder is "2"

‎LayoutTests/css3/flexbox/css-properties.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@
88
<div id="flexitem"></div>
99
</div>
1010
<script>
11-
description('Tests being able to set the display to -webkit-flexbox and -webkit-inline-flexbox.');
11+
description('Tests being able to set the display to -webkit-flex and -webkit-inline-flex.');
1212

1313
var flexbox = document.getElementById("flexbox");
1414

15-
flexbox.style.display = '-webkit-flexbox';
16-
shouldBeEqualToString('flexbox.style.display', '-webkit-flexbox');
15+
flexbox.style.display = '-webkit-flex';
16+
shouldBeEqualToString('flexbox.style.display', '-webkit-flex');
1717

1818
flexbox.style.display = 'inline';
1919
shouldBeEqualToString('flexbox.style.display', 'inline');
2020

21-
flexbox.style.display = '-webkit-inline-flexbox';
22-
shouldBeEqualToString('flexbox.style.display', '-webkit-inline-flexbox');
21+
flexbox.style.display = '-webkit-inline-flex';
22+
shouldBeEqualToString('flexbox.style.display', '-webkit-inline-flex');
2323

2424
flexbox.style.display = 'junk';
25-
shouldBeEqualToString('flexbox.style.display', '-webkit-inline-flexbox');
25+
shouldBeEqualToString('flexbox.style.display', '-webkit-inline-flex');
2626

2727
flexbox.style.display = 'block';
2828
shouldBeEqualToString('flexbox.style.display', 'block');

‎LayoutTests/css3/flexbox/display-flexbox-set-get-expected.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
Test that setting and getting display: -webkit-flexbox and -webkit-inline-flexbox works as expected
1+
Test that setting and getting display: -webkit-flex and -webkit-inline-flex works as expected
22

33
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
44

55

66
Test getting |display| set through CSS
7-
PASS getComputedStyle(flexboxElement, '').getPropertyValue('display') is '-webkit-flexbox'
8-
PASS getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display') is '-webkit-inline-flexbox'
7+
PASS getComputedStyle(flexboxElement, '').getPropertyValue('display') is '-webkit-flex'
8+
PASS getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display') is '-webkit-inline-flex'
99

1010
Test getting and setting display through JS
1111
PASS getComputedStyle(element, '').getPropertyValue('display') is 'block'
12-
PASS getComputedStyle(element, '').getPropertyValue('display') is '-webkit-flexbox'
12+
PASS getComputedStyle(element, '').getPropertyValue('display') is '-webkit-flex'
1313
PASS getComputedStyle(element, '').getPropertyValue('display') is 'block'
14-
PASS getComputedStyle(element, '').getPropertyValue('display') is '-webkit-inline-flexbox'
14+
PASS getComputedStyle(element, '').getPropertyValue('display') is '-webkit-inline-flex'
1515
PASS successfullyParsed is true
1616

1717
TEST COMPLETE

0 commit comments

Comments
 (0)