Skip to content

Commit 17d953f

Browse files
webkit-commit-queuewebkit-commit-queue
committed
2010-07-21 Peter Beverloo <peter@lvp-media.com>
 Reviewed by Eric Carlson. Removed support for the -khtml CSS vendor prefix and limit the -apple prefix to two properties (dashboard-region and line-clamp). Listed properties in these updated have been changed to -webkit. * fast/block/positioning/height-change.html: -apple-box * fast/block/positioning/resources/window-height-change-frame-flex.html: -apple-box * fast/borders/border-image-omit-right-slice.html: -khtml-border-image * fast/css/apple-prefix.html: -khtml-box-orient * fast/css/legacy-opacity-styles-expected.txt: -*-opacity * fast/css/legacy-opacity-styles.html: -*-opacity * fast/css/limited-vendor-prefix-behavior-expected.txt: Added. * fast/css/limited-vendor-prefix-behavior.html: Added. * fast/flexbox/001.html: -khtml-box-flex * fast/flexbox/002.html: -khtml-box, -khtml-box-align, -khtml-box-orient * fast/flexbox/003.html: -khtml-box, -khtml-box-align, -khtml-box-orient * fast/flexbox/004.html: -khtml-box * fast/flexbox/005.html: -khtml-box * fast/flexbox/006.html: -khtml-box * fast/flexbox/007.html: -khtml-box * fast/flexbox/008.html: -khtml-box * fast/flexbox/009.html: -khtml-box * fast/flexbox/010.html: -khtml-box * fast/flexbox/011.html: -khtml-box, -khtml-box-flex * fast/flexbox/012.html: -khtml-box, -khtml-box-orient, -khtml-box-align * fast/flexbox/013.html: -khtml-box, -khtml-box-flex * fast/flexbox/014.html: -khtml-box, -khtml-box-orient, -khtml-box-flex * fast/flexbox/015.html: -khtml-box, -khtml-box-flex, -khtml-box-flex * fast/flexbox/016.html: -khtml-box-flex, -khtml-box, -khtml-box-orient * fast/flexbox/017.html: -khtml-box, -khtml-box-orient, -webkit-box-pack, -khtml-box-direction * fast/flexbox/018.html: -khtml-box, -khtml-box-orient, -khtml-box-pack * fast/flexbox/019.html: -khtml-box, -khtml-box-pack, -khtml-box-orient * fast/flexbox/020.html: -khtml-box, -khtml-box-flex-group, -khtml-box-flex * fast/flexbox/021.html: -khtml-box, -khtml-box-flex * fast/flexbox/022.html: -khtml-box, -khtml-box-flex * fast/flexbox/023.html: -khtml-box * fast/flexbox/024.html: -khtml-box, -khtml-box-orient * fast/flexbox/025.html: -khtml-box, -khtml-box-flex * fast/flexbox/026.html: -khtml-box, -khtml-box-flex * fast/flexbox/child-flexing.html: -khtml-box, -khtml-box-align, -khtml-box-orient * fast/repaint/flexible-box-overflow-horizontal.html: -khtml-box, -khtml-box-align, -khtml-box-orient * fast/repaint/flexible-box-overflow.html: -khtml-box, -khtml-box-align, -khtml-box-orient 2010-07-21 Peter Beverloo <peter@lvp-media.com> Reviewed by Eric Carlson. Removed support for the -khtml CSS vendor prefix and limit the -apple prefix to two properties (dashboard-region and line-clamp). Test: fast/css/limited-vendor-prefix-behavior.html * css/CSSParser.cpp: (WebCore::cssPropertyID): Canonical link: https://commits.webkit.org/54691@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63854 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent cfbc047 commit 17d953f

40 files changed

Lines changed: 247 additions & 159 deletions

‎LayoutTests/ChangeLog‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,50 @@
1+
2010-07-21 Peter Beverloo <peter@lvp-media.com>
2+
3+
Reviewed by Eric Carlson.
4+
5+
Removed support for the -khtml CSS vendor prefix and limit the
6+
-apple prefix to two properties (dashboard-region and line-clamp).
7+
8+
Listed properties in these updated have been changed to -webkit.
9+
10+
* fast/block/positioning/height-change.html: -apple-box
11+
* fast/block/positioning/resources/window-height-change-frame-flex.html: -apple-box
12+
* fast/borders/border-image-omit-right-slice.html: -khtml-border-image
13+
* fast/css/apple-prefix.html: -khtml-box-orient
14+
* fast/css/legacy-opacity-styles-expected.txt: -*-opacity
15+
* fast/css/legacy-opacity-styles.html: -*-opacity
16+
* fast/css/limited-vendor-prefix-behavior-expected.txt: Added.
17+
* fast/css/limited-vendor-prefix-behavior.html: Added.
18+
* fast/flexbox/001.html: -khtml-box-flex
19+
* fast/flexbox/002.html: -khtml-box, -khtml-box-align, -khtml-box-orient
20+
* fast/flexbox/003.html: -khtml-box, -khtml-box-align, -khtml-box-orient
21+
* fast/flexbox/004.html: -khtml-box
22+
* fast/flexbox/005.html: -khtml-box
23+
* fast/flexbox/006.html: -khtml-box
24+
* fast/flexbox/007.html: -khtml-box
25+
* fast/flexbox/008.html: -khtml-box
26+
* fast/flexbox/009.html: -khtml-box
27+
* fast/flexbox/010.html: -khtml-box
28+
* fast/flexbox/011.html: -khtml-box, -khtml-box-flex
29+
* fast/flexbox/012.html: -khtml-box, -khtml-box-orient, -khtml-box-align
30+
* fast/flexbox/013.html: -khtml-box, -khtml-box-flex
31+
* fast/flexbox/014.html: -khtml-box, -khtml-box-orient, -khtml-box-flex
32+
* fast/flexbox/015.html: -khtml-box, -khtml-box-flex, -khtml-box-flex
33+
* fast/flexbox/016.html: -khtml-box-flex, -khtml-box, -khtml-box-orient
34+
* fast/flexbox/017.html: -khtml-box, -khtml-box-orient, -webkit-box-pack, -khtml-box-direction
35+
* fast/flexbox/018.html: -khtml-box, -khtml-box-orient, -khtml-box-pack
36+
* fast/flexbox/019.html: -khtml-box, -khtml-box-pack, -khtml-box-orient
37+
* fast/flexbox/020.html: -khtml-box, -khtml-box-flex-group, -khtml-box-flex
38+
* fast/flexbox/021.html: -khtml-box, -khtml-box-flex
39+
* fast/flexbox/022.html: -khtml-box, -khtml-box-flex
40+
* fast/flexbox/023.html: -khtml-box
41+
* fast/flexbox/024.html: -khtml-box, -khtml-box-orient
42+
* fast/flexbox/025.html: -khtml-box, -khtml-box-flex
43+
* fast/flexbox/026.html: -khtml-box, -khtml-box-flex
44+
* fast/flexbox/child-flexing.html: -khtml-box, -khtml-box-align, -khtml-box-orient
45+
* fast/repaint/flexible-box-overflow-horizontal.html: -khtml-box, -khtml-box-align, -khtml-box-orient
46+
* fast/repaint/flexible-box-overflow.html: -khtml-box, -khtml-box-align, -khtml-box-orient
47+
148
2010-07-21 Sam Weinig <sam@webkit.org>
249

350
Reviewed by Anders Carlsson.

‎LayoutTests/fast/block/positioning/height-change.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<div id="t" style="background: skyblue; height: 50px; width: 100px;"></div>
2727
</div>
2828
<br>
29-
<div style="position: relative; display: -apple-box;">
29+
<div style="position: relative; display: -webkit-box;">
3030
<div class=articlefooter></div>
3131
<div id="u" style="background: skyblue; height: 50px; width: 100px;"></div>
3232
</div>

‎LayoutTests/fast/block/positioning/resources/window-height-change-frame-flex.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2-
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" style="display: -apple-box;">
2+
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" style="display: -webkit-box;">
33
<head>
4-
<style type="text/css">
5-
body {
6-
background: red;
7-
}
4+
<style type="text/css">
5+
body {
6+
background: red;
7+
}
88
div {
99
background: green;
1010
width: 100px;
11-
position: absolute;
12-
top: 0;
13-
bottom: 0;
14-
left: 0;
15-
right: 0;
11+
position: absolute;
12+
top: 0;
13+
bottom: 0;
14+
left: 0;
15+
right: 0;
1616
}
17-
</style>
17+
</style>
1818
</head>
1919
<body>
2020
<div></div>

‎LayoutTests/fast/borders/border-image-omit-right-slice.html‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
2-
"http://www.w3.org/TR/html4/strict.dtd">
2+
"http://www.w3.org/TR/html4/strict.dtd">
33
<html lang="en-US">
44
<head>
5-
<title>border-image bug</title>
6-
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
7-
<meta http-equiv="Content-Style-Type" content="text/css">
8-
<style type="text/css">
5+
<title>border-image bug</title>
6+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
7+
<meta http-equiv="Content-Style-Type" content="text/css">
8+
<style type="text/css">
99

10-
div {
11-
width: 200px;
12-
height: 200px;
13-
}
10+
div {
11+
width: 200px;
12+
height: 200px;
13+
}
1414

15-
body > div {
16-
-moz-border-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAIAAAACUFjqAAAAAXNSR0IArs4c6QAAAUFJREFUGNMBNgHJ/gPcUkznH/n8lGR5YkMIIMDXFhgoVNnfqeM5dbre55MDGkF/U6tMmi12K6QBpfkB4H3NyPZAiyjm6kp//uPtAA4pZhHPJ8xbkSop4chy5ecPsVSqkC03ozAmk77SOwOHR+fDXmoF5UUJU9YsnVfehg/iLC7p3etC3w3LEA8D0eGf/DZozPPzoSSX6gTVlQ/L4Ylt4SrFiOgqNDQPAPvl/JQuLv33xK66eAgGCn+OAIUu1Fugs2hsZNIB6gPhrZ80q7sXNUEuIE7EGNC5Dc2ExcIe9tseb4r7usAAralzLgdas9URX21wGUqSgDnf/jMydhxMIEx4w9TtAfCQPsbi30EEVABXFJYnOZgfbQK3CLkwg6PDGG27KwOYF7jD+sIHhdwoUyILAF5sv/6bI6S56fbULB5OToUjFpS7UHGrVgAAAABJRU5ErkJggg==) 1 2 3;
17-
-khtml-border-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAIAAAACUFjqAAAAAXNSR0IArs4c6QAAAUFJREFUGNMBNgHJ/gPcUkznH/n8lGR5YkMIIMDXFhgoVNnfqeM5dbre55MDGkF/U6tMmi12K6QBpfkB4H3NyPZAiyjm6kp//uPtAA4pZhHPJ8xbkSop4chy5ecPsVSqkC03ozAmk77SOwOHR+fDXmoF5UUJU9YsnVfehg/iLC7p3etC3w3LEA8D0eGf/DZozPPzoSSX6gTVlQ/L4Ylt4SrFiOgqNDQPAPvl/JQuLv33xK66eAgGCn+OAIUu1Fugs2hsZNIB6gPhrZ80q7sXNUEuIE7EGNC5Dc2ExcIe9tseb4r7usAAralzLgdas9URX21wGUqSgDnf/jMydhxMIEx4w9TtAfCQPsbi30EEVABXFJYnOZgfbQK3CLkwg6PDGG27KwOYF7jD+sIHhdwoUyILAF5sv/6bI6S56fbULB5OToUjFpS7UHGrVgAAAABJRU5ErkJggg==) 1 2 3;
18-
border-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAIAAAACUFjqAAAAAXNSR0IArs4c6QAAAUFJREFUGNMBNgHJ/gPcUkznH/n8lGR5YkMIIMDXFhgoVNnfqeM5dbre55MDGkF/U6tMmi12K6QBpfkB4H3NyPZAiyjm6kp//uPtAA4pZhHPJ8xbkSop4chy5ecPsVSqkC03ozAmk77SOwOHR+fDXmoF5UUJU9YsnVfehg/iLC7p3etC3w3LEA8D0eGf/DZozPPzoSSX6gTVlQ/L4Ylt4SrFiOgqNDQPAPvl/JQuLv33xK66eAgGCn+OAIUu1Fugs2hsZNIB6gPhrZ80q7sXNUEuIE7EGNC5Dc2ExcIe9tseb4r7usAAralzLgdas9URX21wGUqSgDnf/jMydhxMIEx4w9TtAfCQPsbi30EEVABXFJYnOZgfbQK3CLkwg6PDGG27KwOYF7jD+sIHhdwoUyILAF5sv/6bI6S56fbULB5OToUjFpS7UHGrVgAAAABJRU5ErkJggg==) 1 2 3;
19-
border-width: 100px;
20-
}
15+
body > div {
16+
-moz-border-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAIAAAACUFjqAAAAAXNSR0IArs4c6QAAAUFJREFUGNMBNgHJ/gPcUkznH/n8lGR5YkMIIMDXFhgoVNnfqeM5dbre55MDGkF/U6tMmi12K6QBpfkB4H3NyPZAiyjm6kp//uPtAA4pZhHPJ8xbkSop4chy5ecPsVSqkC03ozAmk77SOwOHR+fDXmoF5UUJU9YsnVfehg/iLC7p3etC3w3LEA8D0eGf/DZozPPzoSSX6gTVlQ/L4Ylt4SrFiOgqNDQPAPvl/JQuLv33xK66eAgGCn+OAIUu1Fugs2hsZNIB6gPhrZ80q7sXNUEuIE7EGNC5Dc2ExcIe9tseb4r7usAAralzLgdas9URX21wGUqSgDnf/jMydhxMIEx4w9TtAfCQPsbi30EEVABXFJYnOZgfbQK3CLkwg6PDGG27KwOYF7jD+sIHhdwoUyILAF5sv/6bI6S56fbULB5OToUjFpS7UHGrVgAAAABJRU5ErkJggg==) 1 2 3;
17+
-webkit-border-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAIAAAACUFjqAAAAAXNSR0IArs4c6QAAAUFJREFUGNMBNgHJ/gPcUkznH/n8lGR5YkMIIMDXFhgoVNnfqeM5dbre55MDGkF/U6tMmi12K6QBpfkB4H3NyPZAiyjm6kp//uPtAA4pZhHPJ8xbkSop4chy5ecPsVSqkC03ozAmk77SOwOHR+fDXmoF5UUJU9YsnVfehg/iLC7p3etC3w3LEA8D0eGf/DZozPPzoSSX6gTVlQ/L4Ylt4SrFiOgqNDQPAPvl/JQuLv33xK66eAgGCn+OAIUu1Fugs2hsZNIB6gPhrZ80q7sXNUEuIE7EGNC5Dc2ExcIe9tseb4r7usAAralzLgdas9URX21wGUqSgDnf/jMydhxMIEx4w9TtAfCQPsbi30EEVABXFJYnOZgfbQK3CLkwg6PDGG27KwOYF7jD+sIHhdwoUyILAF5sv/6bI6S56fbULB5OToUjFpS7UHGrVgAAAABJRU5ErkJggg==) 1 2 3;
18+
border-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAIAAAACUFjqAAAAAXNSR0IArs4c6QAAAUFJREFUGNMBNgHJ/gPcUkznH/n8lGR5YkMIIMDXFhgoVNnfqeM5dbre55MDGkF/U6tMmi12K6QBpfkB4H3NyPZAiyjm6kp//uPtAA4pZhHPJ8xbkSop4chy5ecPsVSqkC03ozAmk77SOwOHR+fDXmoF5UUJU9YsnVfehg/iLC7p3etC3w3LEA8D0eGf/DZozPPzoSSX6gTVlQ/L4Ylt4SrFiOgqNDQPAPvl/JQuLv33xK66eAgGCn+OAIUu1Fugs2hsZNIB6gPhrZ80q7sXNUEuIE7EGNC5Dc2ExcIe9tseb4r7usAAralzLgdas9URX21wGUqSgDnf/jMydhxMIEx4w9TtAfCQPsbi30EEVABXFJYnOZgfbQK3CLkwg6PDGG27KwOYF7jD+sIHhdwoUyILAF5sv/6bI6S56fbULB5OToUjFpS7UHGrVgAAAABJRU5ErkJggg==) 1 2 3;
19+
border-width: 100px;
20+
}
2121

22-
body > div > div {
23-
background: white;
24-
}
22+
body > div > div {
23+
background: white;
24+
}
2525

26-
</style>
26+
</style>
2727
</head>
2828
<body>
2929
<div><div></div></div>

‎LayoutTests/fast/css/apple-prefix.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<style>
1111
.content {
1212
overflow: hidden;
13-
display: -khtml-box;
14-
-khtml-box-orient: vertical;
13+
display: -webkit-box;
14+
-webkit-box-orient: vertical;
1515
}
1616
</style>
1717
</head>

‎LayoutTests/fast/css/legacy-opacity-styles-expected.txt‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,8 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
44

55

66
PASS document.getElementById('test-opacity').style.getPropertyValue('opacity') is '0.2'
7-
PASS document.getElementById('test-opacity').style.getPropertyValue('-apple-opacity') is '0.2'
8-
PASS document.getElementById('test-opacity').style.getPropertyValue('-khtml-opacity') is '0.2'
97
PASS document.getElementById('test-opacity').style.getPropertyValue('-webkit-opacity') is '0.2'
10-
PASS document.getElementById('test-apple-opacity').style.getPropertyValue('opacity') is '0.4'
11-
PASS document.getElementById('test-apple-opacity').style.getPropertyValue('-apple-opacity') is '0.4'
12-
PASS document.getElementById('test-apple-opacity').style.getPropertyValue('-khtml-opacity') is '0.4'
13-
PASS document.getElementById('test-apple-opacity').style.getPropertyValue('-webkit-opacity') is '0.4'
14-
PASS document.getElementById('test-khtml-opacity').style.getPropertyValue('opacity') is '0.6'
15-
PASS document.getElementById('test-khtml-opacity').style.getPropertyValue('-apple-opacity') is '0.6'
16-
PASS document.getElementById('test-khtml-opacity').style.getPropertyValue('-khtml-opacity') is '0.6'
17-
PASS document.getElementById('test-khtml-opacity').style.getPropertyValue('-webkit-opacity') is '0.6'
188
PASS document.getElementById('test-webkit-opacity').style.getPropertyValue('opacity') is '0.8'
19-
PASS document.getElementById('test-webkit-opacity').style.getPropertyValue('-apple-opacity') is '0.8'
20-
PASS document.getElementById('test-webkit-opacity').style.getPropertyValue('-khtml-opacity') is '0.8'
219
PASS document.getElementById('test-webkit-opacity').style.getPropertyValue('-webkit-opacity') is '0.8'
2210
PASS successfullyParsed is true
2311

‎LayoutTests/fast/css/legacy-opacity-styles.html‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,16 @@
66
</head>
77
<body>
88
<div id="test-opacity" style="opacity: 0.2;"></div>
9-
<div id="test-apple-opacity" style="-apple-opacity: 0.4;"></div>
10-
<div id="test-khtml-opacity" style="-khtml-opacity: 0.6;"></div>
119
<div id="test-webkit-opacity" style="-webkit-opacity: 0.8;"></div>
1210
<p id="description"></p>
1311
<div id="console"></div>
1412
<script>
1513
description("This test checks that the legacy -apple-opacity, -khtml-opacity and -webkit-opacity styles are mapped to the opacity style.");
1614

1715
shouldBe("document.getElementById('test-opacity').style.getPropertyValue('opacity')", "'0.2'");
18-
shouldBe("document.getElementById('test-opacity').style.getPropertyValue('-apple-opacity')", "'0.2'");
19-
shouldBe("document.getElementById('test-opacity').style.getPropertyValue('-khtml-opacity')", "'0.2'");
2016
shouldBe("document.getElementById('test-opacity').style.getPropertyValue('-webkit-opacity')", "'0.2'");
2117

22-
shouldBe("document.getElementById('test-apple-opacity').style.getPropertyValue('opacity')", "'0.4'");
23-
shouldBe("document.getElementById('test-apple-opacity').style.getPropertyValue('-apple-opacity')", "'0.4'");
24-
shouldBe("document.getElementById('test-apple-opacity').style.getPropertyValue('-khtml-opacity')", "'0.4'");
25-
shouldBe("document.getElementById('test-apple-opacity').style.getPropertyValue('-webkit-opacity')", "'0.4'");
26-
27-
shouldBe("document.getElementById('test-khtml-opacity').style.getPropertyValue('opacity')", "'0.6'");
28-
shouldBe("document.getElementById('test-khtml-opacity').style.getPropertyValue('-apple-opacity')", "'0.6'");
29-
shouldBe("document.getElementById('test-khtml-opacity').style.getPropertyValue('-khtml-opacity')", "'0.6'");
30-
shouldBe("document.getElementById('test-khtml-opacity').style.getPropertyValue('-webkit-opacity')", "'0.6'");
31-
3218
shouldBe("document.getElementById('test-webkit-opacity').style.getPropertyValue('opacity')", "'0.8'");
33-
shouldBe("document.getElementById('test-webkit-opacity').style.getPropertyValue('-apple-opacity')", "'0.8'");
34-
shouldBe("document.getElementById('test-webkit-opacity').style.getPropertyValue('-khtml-opacity')", "'0.8'");
3519
shouldBe("document.getElementById('test-webkit-opacity').style.getPropertyValue('-webkit-opacity')", "'0.8'");
3620

3721
var successfullyParsed = true;

‎LayoutTests/fast/css/limited-vendor-prefix-behavior-expected.txt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Testing updated vendor-prefix behavior (bug 42093), removal of -khtml and limitation of -apple.
2+
3+
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
4+
5+
6+
PASS document.getElementById('test-no-khtml').style.getPropertyValue('-khtml-line-clamp') is null
7+
PASS document.getElementById('test-no-khtml').style.getPropertyValue('-webkit-line-clamp') is null
8+
PASS document.getElementById('test-no-khtml').style.getPropertyValue('-khtml-user-drag') is null
9+
PASS document.getElementById('test-no-khtml').style.getPropertyValue('-webkit-user-drag') is null
10+
PASS document.getElementById('test-no-khtml').style.khtmlLineClamp is undefined
11+
PASS document.getElementById('test-no-khtml').style.khtmlUserDrag is undefined
12+
PASS document.getElementById('test-no-khtml').style.lineClamp is undefined
13+
PASS document.getElementById('test-no-khtml').style.userDrag is undefined
14+
PASS document.getElementById('test-limited-apple').style.getPropertyValue('-apple-line-clamp') is '10%'
15+
PASS document.getElementById('test-limited-apple').style.getPropertyValue('-webkit-line-clamp') is '10%'
16+
PASS document.getElementById('test-limited-apple').style.getPropertyValue('-apple-user-drag') is null
17+
PASS document.getElementById('test-limited-apple').style.getPropertyValue('-webkit-user-drag') is null
18+
PASS document.getElementById('test-limited-apple').style.appleLineClamp is '10%'
19+
PASS document.getElementById('test-limited-apple').style.appleUserDrag is undefined
20+
PASS successfullyParsed is true
21+
22+
TEST COMPLETE
23+

‎LayoutTests/fast/css/limited-vendor-prefix-behavior.html‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
2+
<html>
3+
<head>
4+
<style type="text/css"></style>
5+
<link rel="stylesheet" href="../js/resources/js-test-style.css">
6+
<script src="../js/resources/js-test-pre.js"></script>
7+
</head>
8+
<body>
9+
<p id="description"></p>
10+
<div id="test-no-khtml" style="-khtml-line-clamp: 10%; -khtml-user-drag: none"></div>
11+
<div id="test-limited-apple" style="-apple-line-clamp: 10%; -apple-user-drag: none;"></div>
12+
<div id="console"></div>
13+
<script>
14+
description("Testing updated vendor-prefix behavior (bug 42093), removal of -khtml and limitation of -apple.");
15+
16+
shouldBe("document.getElementById('test-no-khtml').style.getPropertyValue('-khtml-line-clamp')", "null");
17+
shouldBe("document.getElementById('test-no-khtml').style.getPropertyValue('-webkit-line-clamp')", "null");
18+
shouldBe("document.getElementById('test-no-khtml').style.getPropertyValue('-khtml-user-drag')", "null");
19+
shouldBe("document.getElementById('test-no-khtml').style.getPropertyValue('-webkit-user-drag')", "null");
20+
21+
shouldBe("document.getElementById('test-no-khtml').style.khtmlLineClamp", "undefined");
22+
shouldBe("document.getElementById('test-no-khtml').style.khtmlUserDrag", "undefined");
23+
shouldBe("document.getElementById('test-no-khtml').style.lineClamp", "undefined");
24+
shouldBe("document.getElementById('test-no-khtml').style.userDrag", "undefined");
25+
26+
shouldBe("document.getElementById('test-limited-apple').style.getPropertyValue('-apple-line-clamp')", "'10%'");
27+
shouldBe("document.getElementById('test-limited-apple').style.getPropertyValue('-webkit-line-clamp')", "'10%'");
28+
shouldBe("document.getElementById('test-limited-apple').style.getPropertyValue('-apple-user-drag')", "null");
29+
shouldBe("document.getElementById('test-limited-apple').style.getPropertyValue('-webkit-user-drag')", "null");
30+
31+
shouldBe("document.getElementById('test-limited-apple').style.appleLineClamp", "'10%'");
32+
shouldBe("document.getElementById('test-limited-apple').style.appleUserDrag", "undefined");
33+
34+
var successfullyParsed = true;
35+
</script>
36+
<script src="../js/resources/js-test-post.js"></script>
37+
</body>
38+
</html>

‎LayoutTests/fast/flexbox/001.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<style>
44
div {
55
display: -moz-box;
6-
display: -khtml-box;
6+
display: -webkit-box;
77
display: box;
88
width: 100px;
99
height: 100px;
@@ -18,7 +18,7 @@
1818
div.inner {
1919
background-color:green;
2020
-moz-box-flex: 1;
21-
-khtml-box-flex: 1;
21+
-webkit-box-flex: 1;
2222
box-flex: 1;
2323
width:10px;
2424
height:100px;

0 commit comments

Comments
 (0)