[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 11:23:52 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a659cc29a3fe51efecedf48ef10c9bd96f105936
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 21 20:39:15 2010 +0000
2010-07-21 Peter Beverloo <peter at 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 at 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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63854 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1c5e6b6..9725b7f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,50 @@
+2010-07-21 Peter Beverloo <peter at 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 Sam Weinig <sam at webkit.org>
Reviewed by Anders Carlsson.
diff --git a/LayoutTests/fast/block/positioning/height-change.html b/LayoutTests/fast/block/positioning/height-change.html
index 8b4ab66..3388ba1 100644
--- a/LayoutTests/fast/block/positioning/height-change.html
+++ b/LayoutTests/fast/block/positioning/height-change.html
@@ -26,7 +26,7 @@
<div id="t" style="background: skyblue; height: 50px; width: 100px;"></div>
</div>
<br>
-<div style="position: relative; display: -apple-box;">
+<div style="position: relative; display: -webkit-box;">
<div class=articlefooter></div>
<div id="u" style="background: skyblue; height: 50px; width: 100px;"></div>
</div>
diff --git a/LayoutTests/fast/block/positioning/resources/window-height-change-frame-flex.html b/LayoutTests/fast/block/positioning/resources/window-height-change-frame-flex.html
index 13d90bb..8d10871 100644
--- a/LayoutTests/fast/block/positioning/resources/window-height-change-frame-flex.html
+++ b/LayoutTests/fast/block/positioning/resources/window-height-change-frame-flex.html
@@ -1,20 +1,20 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" style="display: -apple-box;">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" style="display: -webkit-box;">
<head>
- <style type="text/css">
- body {
- background: red;
- }
+ <style type="text/css">
+ body {
+ background: red;
+ }
div {
background: green;
width: 100px;
- position: absolute;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
}
- </style>
+ </style>
</head>
<body>
<div></div>
diff --git a/LayoutTests/fast/borders/border-image-omit-right-slice.html b/LayoutTests/fast/borders/border-image-omit-right-slice.html
index 13909e0..71b3429 100644
--- a/LayoutTests/fast/borders/border-image-omit-right-slice.html
+++ b/LayoutTests/fast/borders/border-image-omit-right-slice.html
@@ -1,29 +1,29 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
- "http://www.w3.org/TR/html4/strict.dtd">
+ "http://www.w3.org/TR/html4/strict.dtd">
<html lang="en-US">
<head>
- <title>border-image bug</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <meta http-equiv="Content-Style-Type" content="text/css">
- <style type="text/css">
+ <title>border-image bug</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <meta http-equiv="Content-Style-Type" content="text/css">
+ <style type="text/css">
- div {
- width: 200px;
- height: 200px;
- }
+ div {
+ width: 200px;
+ height: 200px;
+ }
- body > div {
- -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;
- -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;
- border-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAIAAAACUFjqAAAAAXNSR0IArs4c6QAAAUFJREFUGNMBNgHJ/gPcUkznH/n8lGR5YkMIIMDXFhgoVNnfqeM5dbre55MDGkF/U6tMmi12K6QBpfkB4H3NyPZAiyjm6kp//uPtAA4pZhHPJ8xbkSop4chy5ecPsVSqkC03ozAmk77SOwOHR+fDXmoF5UUJU9YsnVfehg/iLC7p3etC3w3LEA8D0eGf/DZozPPzoSSX6gTVlQ/L4Ylt4SrFiOgqNDQPAPvl/JQuLv33xK66eAgGCn+OAIUu1Fugs2hsZNIB6gPhrZ80q7sXNUEuIE7EGNC5Dc2ExcIe9tseb4r7usAAralzLgdas9URX21wGUqSgDnf/jMydhxMIEx4w9TtAfCQPsbi30EEVABXFJYnOZgfbQK3CLkwg6PDGG27KwOYF7jD+sIHhdwoUyILAF5sv/6bI6S56fbULB5OToUjFpS7UHGrVgAAAABJRU5ErkJggg==) 1 2 3;
- border-width: 100px;
- }
+ body > div {
+ -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;
+ -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;
+ border-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAIAAAACUFjqAAAAAXNSR0IArs4c6QAAAUFJREFUGNMBNgHJ/gPcUkznH/n8lGR5YkMIIMDXFhgoVNnfqeM5dbre55MDGkF/U6tMmi12K6QBpfkB4H3NyPZAiyjm6kp//uPtAA4pZhHPJ8xbkSop4chy5ecPsVSqkC03ozAmk77SOwOHR+fDXmoF5UUJU9YsnVfehg/iLC7p3etC3w3LEA8D0eGf/DZozPPzoSSX6gTVlQ/L4Ylt4SrFiOgqNDQPAPvl/JQuLv33xK66eAgGCn+OAIUu1Fugs2hsZNIB6gPhrZ80q7sXNUEuIE7EGNC5Dc2ExcIe9tseb4r7usAAralzLgdas9URX21wGUqSgDnf/jMydhxMIEx4w9TtAfCQPsbi30EEVABXFJYnOZgfbQK3CLkwg6PDGG27KwOYF7jD+sIHhdwoUyILAF5sv/6bI6S56fbULB5OToUjFpS7UHGrVgAAAABJRU5ErkJggg==) 1 2 3;
+ border-width: 100px;
+ }
- body > div > div {
- background: white;
- }
+ body > div > div {
+ background: white;
+ }
- </style>
+ </style>
</head>
<body>
<div><div></div></div>
diff --git a/LayoutTests/fast/css/apple-prefix.html b/LayoutTests/fast/css/apple-prefix.html
index a790fbd..de6aaf3 100644
--- a/LayoutTests/fast/css/apple-prefix.html
+++ b/LayoutTests/fast/css/apple-prefix.html
@@ -10,8 +10,8 @@ function test()
<style>
.content {
overflow: hidden;
- display: -khtml-box;
- -khtml-box-orient: vertical;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
}
</style>
</head>
diff --git a/LayoutTests/fast/css/legacy-opacity-styles-expected.txt b/LayoutTests/fast/css/legacy-opacity-styles-expected.txt
index bc94e2b..d30f139 100644
--- a/LayoutTests/fast/css/legacy-opacity-styles-expected.txt
+++ b/LayoutTests/fast/css/legacy-opacity-styles-expected.txt
@@ -4,20 +4,8 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS document.getElementById('test-opacity').style.getPropertyValue('opacity') is '0.2'
-PASS document.getElementById('test-opacity').style.getPropertyValue('-apple-opacity') is '0.2'
-PASS document.getElementById('test-opacity').style.getPropertyValue('-khtml-opacity') is '0.2'
PASS document.getElementById('test-opacity').style.getPropertyValue('-webkit-opacity') is '0.2'
-PASS document.getElementById('test-apple-opacity').style.getPropertyValue('opacity') is '0.4'
-PASS document.getElementById('test-apple-opacity').style.getPropertyValue('-apple-opacity') is '0.4'
-PASS document.getElementById('test-apple-opacity').style.getPropertyValue('-khtml-opacity') is '0.4'
-PASS document.getElementById('test-apple-opacity').style.getPropertyValue('-webkit-opacity') is '0.4'
-PASS document.getElementById('test-khtml-opacity').style.getPropertyValue('opacity') is '0.6'
-PASS document.getElementById('test-khtml-opacity').style.getPropertyValue('-apple-opacity') is '0.6'
-PASS document.getElementById('test-khtml-opacity').style.getPropertyValue('-khtml-opacity') is '0.6'
-PASS document.getElementById('test-khtml-opacity').style.getPropertyValue('-webkit-opacity') is '0.6'
PASS document.getElementById('test-webkit-opacity').style.getPropertyValue('opacity') is '0.8'
-PASS document.getElementById('test-webkit-opacity').style.getPropertyValue('-apple-opacity') is '0.8'
-PASS document.getElementById('test-webkit-opacity').style.getPropertyValue('-khtml-opacity') is '0.8'
PASS document.getElementById('test-webkit-opacity').style.getPropertyValue('-webkit-opacity') is '0.8'
PASS successfullyParsed is true
diff --git a/LayoutTests/fast/css/legacy-opacity-styles.html b/LayoutTests/fast/css/legacy-opacity-styles.html
index b385c04..b7fbb6c 100644
--- a/LayoutTests/fast/css/legacy-opacity-styles.html
+++ b/LayoutTests/fast/css/legacy-opacity-styles.html
@@ -6,8 +6,6 @@
</head>
<body>
<div id="test-opacity" style="opacity: 0.2;"></div>
-<div id="test-apple-opacity" style="-apple-opacity: 0.4;"></div>
-<div id="test-khtml-opacity" style="-khtml-opacity: 0.6;"></div>
<div id="test-webkit-opacity" style="-webkit-opacity: 0.8;"></div>
<p id="description"></p>
<div id="console"></div>
@@ -15,23 +13,9 @@
description("This test checks that the legacy -apple-opacity, -khtml-opacity and -webkit-opacity styles are mapped to the opacity style.");
shouldBe("document.getElementById('test-opacity').style.getPropertyValue('opacity')", "'0.2'");
-shouldBe("document.getElementById('test-opacity').style.getPropertyValue('-apple-opacity')", "'0.2'");
-shouldBe("document.getElementById('test-opacity').style.getPropertyValue('-khtml-opacity')", "'0.2'");
shouldBe("document.getElementById('test-opacity').style.getPropertyValue('-webkit-opacity')", "'0.2'");
-shouldBe("document.getElementById('test-apple-opacity').style.getPropertyValue('opacity')", "'0.4'");
-shouldBe("document.getElementById('test-apple-opacity').style.getPropertyValue('-apple-opacity')", "'0.4'");
-shouldBe("document.getElementById('test-apple-opacity').style.getPropertyValue('-khtml-opacity')", "'0.4'");
-shouldBe("document.getElementById('test-apple-opacity').style.getPropertyValue('-webkit-opacity')", "'0.4'");
-
-shouldBe("document.getElementById('test-khtml-opacity').style.getPropertyValue('opacity')", "'0.6'");
-shouldBe("document.getElementById('test-khtml-opacity').style.getPropertyValue('-apple-opacity')", "'0.6'");
-shouldBe("document.getElementById('test-khtml-opacity').style.getPropertyValue('-khtml-opacity')", "'0.6'");
-shouldBe("document.getElementById('test-khtml-opacity').style.getPropertyValue('-webkit-opacity')", "'0.6'");
-
shouldBe("document.getElementById('test-webkit-opacity').style.getPropertyValue('opacity')", "'0.8'");
-shouldBe("document.getElementById('test-webkit-opacity').style.getPropertyValue('-apple-opacity')", "'0.8'");
-shouldBe("document.getElementById('test-webkit-opacity').style.getPropertyValue('-khtml-opacity')", "'0.8'");
shouldBe("document.getElementById('test-webkit-opacity').style.getPropertyValue('-webkit-opacity')", "'0.8'");
var successfullyParsed = true;
diff --git a/LayoutTests/fast/css/limited-vendor-prefix-behavior-expected.txt b/LayoutTests/fast/css/limited-vendor-prefix-behavior-expected.txt
new file mode 100644
index 0000000..67f2d5d
--- /dev/null
+++ b/LayoutTests/fast/css/limited-vendor-prefix-behavior-expected.txt
@@ -0,0 +1,23 @@
+Testing updated vendor-prefix behavior (bug 42093), removal of -khtml and limitation of -apple.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS document.getElementById('test-no-khtml').style.getPropertyValue('-khtml-line-clamp') is null
+PASS document.getElementById('test-no-khtml').style.getPropertyValue('-webkit-line-clamp') is null
+PASS document.getElementById('test-no-khtml').style.getPropertyValue('-khtml-user-drag') is null
+PASS document.getElementById('test-no-khtml').style.getPropertyValue('-webkit-user-drag') is null
+PASS document.getElementById('test-no-khtml').style.khtmlLineClamp is undefined
+PASS document.getElementById('test-no-khtml').style.khtmlUserDrag is undefined
+PASS document.getElementById('test-no-khtml').style.lineClamp is undefined
+PASS document.getElementById('test-no-khtml').style.userDrag is undefined
+PASS document.getElementById('test-limited-apple').style.getPropertyValue('-apple-line-clamp') is '10%'
+PASS document.getElementById('test-limited-apple').style.getPropertyValue('-webkit-line-clamp') is '10%'
+PASS document.getElementById('test-limited-apple').style.getPropertyValue('-apple-user-drag') is null
+PASS document.getElementById('test-limited-apple').style.getPropertyValue('-webkit-user-drag') is null
+PASS document.getElementById('test-limited-apple').style.appleLineClamp is '10%'
+PASS document.getElementById('test-limited-apple').style.appleUserDrag is undefined
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/css/limited-vendor-prefix-behavior.html b/LayoutTests/fast/css/limited-vendor-prefix-behavior.html
new file mode 100644
index 0000000..d7e4086
--- /dev/null
+++ b/LayoutTests/fast/css/limited-vendor-prefix-behavior.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<style type="text/css"></style>
+<link rel="stylesheet" href="../js/resources/js-test-style.css">
+<script src="../js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="test-no-khtml" style="-khtml-line-clamp: 10%; -khtml-user-drag: none"></div>
+<div id="test-limited-apple" style="-apple-line-clamp: 10%; -apple-user-drag: none;"></div>
+<div id="console"></div>
+<script>
+description("Testing updated vendor-prefix behavior (bug 42093), removal of -khtml and limitation of -apple.");
+
+shouldBe("document.getElementById('test-no-khtml').style.getPropertyValue('-khtml-line-clamp')", "null");
+shouldBe("document.getElementById('test-no-khtml').style.getPropertyValue('-webkit-line-clamp')", "null");
+shouldBe("document.getElementById('test-no-khtml').style.getPropertyValue('-khtml-user-drag')", "null");
+shouldBe("document.getElementById('test-no-khtml').style.getPropertyValue('-webkit-user-drag')", "null");
+
+shouldBe("document.getElementById('test-no-khtml').style.khtmlLineClamp", "undefined");
+shouldBe("document.getElementById('test-no-khtml').style.khtmlUserDrag", "undefined");
+shouldBe("document.getElementById('test-no-khtml').style.lineClamp", "undefined");
+shouldBe("document.getElementById('test-no-khtml').style.userDrag", "undefined");
+
+shouldBe("document.getElementById('test-limited-apple').style.getPropertyValue('-apple-line-clamp')", "'10%'");
+shouldBe("document.getElementById('test-limited-apple').style.getPropertyValue('-webkit-line-clamp')", "'10%'");
+shouldBe("document.getElementById('test-limited-apple').style.getPropertyValue('-apple-user-drag')", "null");
+shouldBe("document.getElementById('test-limited-apple').style.getPropertyValue('-webkit-user-drag')", "null");
+
+shouldBe("document.getElementById('test-limited-apple').style.appleLineClamp", "'10%'");
+shouldBe("document.getElementById('test-limited-apple').style.appleUserDrag", "undefined");
+
+var successfullyParsed = true;
+</script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/fast/flexbox/001.html b/LayoutTests/fast/flexbox/001.html
index 078876f..ecf736d 100644
--- a/LayoutTests/fast/flexbox/001.html
+++ b/LayoutTests/fast/flexbox/001.html
@@ -3,7 +3,7 @@
<style>
div {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
width: 100px;
height: 100px;
@@ -18,7 +18,7 @@ div.outer {
div.inner {
background-color:green;
-moz-box-flex: 1;
- -khtml-box-flex: 1;
+ -webkit-box-flex: 1;
box-flex: 1;
width:10px;
height:100px;
diff --git a/LayoutTests/fast/flexbox/002.html b/LayoutTests/fast/flexbox/002.html
index 15b6880..200d51e 100644
--- a/LayoutTests/fast/flexbox/002.html
+++ b/LayoutTests/fast/flexbox/002.html
@@ -6,13 +6,13 @@ div.crossTop {
width: 100px;
background-color:green;
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
-moz-box-align: center;
- -khtml-box-align: center;
+ -webkit-box-align: center;
box-align: center;
-moz-box-orient: vertical;
- -khtml-box-orient: vertical;
+ -webkit-box-orient: vertical;
box-orient: vertical;
}
diff --git a/LayoutTests/fast/flexbox/003.html b/LayoutTests/fast/flexbox/003.html
index 230141c..1b59e02 100644
--- a/LayoutTests/fast/flexbox/003.html
+++ b/LayoutTests/fast/flexbox/003.html
@@ -6,13 +6,13 @@ div.crossTop {
width: 300px;
background-color:green;
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
-moz-box-align: center;
- -khtml-box-align: center;
+ -webkit-box-align: center;
box-align: center;
-moz-box-orient: horizontal;
- -khtml-box-orient: horizontal;
+ -webkit-box-orient: horizontal;
box-orient: horizontal;
}
diff --git a/LayoutTests/fast/flexbox/004.html b/LayoutTests/fast/flexbox/004.html
index a0e8955..7e9f401 100644
--- a/LayoutTests/fast/flexbox/004.html
+++ b/LayoutTests/fast/flexbox/004.html
@@ -6,7 +6,7 @@ div.box {
width: 100px;
background-color:red;
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
}
diff --git a/LayoutTests/fast/flexbox/005.html b/LayoutTests/fast/flexbox/005.html
index d809c72..d6016c2 100644
--- a/LayoutTests/fast/flexbox/005.html
+++ b/LayoutTests/fast/flexbox/005.html
@@ -5,7 +5,7 @@ div.box {
height: 100px;
background-color:green;
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
width: 100%;
}
diff --git a/LayoutTests/fast/flexbox/006.html b/LayoutTests/fast/flexbox/006.html
index 666e9ec..85e6c9e 100644
--- a/LayoutTests/fast/flexbox/006.html
+++ b/LayoutTests/fast/flexbox/006.html
@@ -5,7 +5,7 @@ div.box {
height: 100px;
background-color:green;
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
}
diff --git a/LayoutTests/fast/flexbox/007.html b/LayoutTests/fast/flexbox/007.html
index e5533d1..38d009c 100644
--- a/LayoutTests/fast/flexbox/007.html
+++ b/LayoutTests/fast/flexbox/007.html
@@ -3,7 +3,7 @@
<style>
div.box {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
}
diff --git a/LayoutTests/fast/flexbox/008.html b/LayoutTests/fast/flexbox/008.html
index e2ede86..24ee1ce 100644
--- a/LayoutTests/fast/flexbox/008.html
+++ b/LayoutTests/fast/flexbox/008.html
@@ -3,7 +3,7 @@
<style>
div.box {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
height: 200px;
width: 100px;
diff --git a/LayoutTests/fast/flexbox/009.html b/LayoutTests/fast/flexbox/009.html
index a2c0d20..0fe37dc 100644
--- a/LayoutTests/fast/flexbox/009.html
+++ b/LayoutTests/fast/flexbox/009.html
@@ -6,7 +6,7 @@ div.box {
width:100px;
background-color:green;
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
overflow:auto;
border: 2px solid olive;
diff --git a/LayoutTests/fast/flexbox/010.html b/LayoutTests/fast/flexbox/010.html
index d75f5fe..fdaff49 100644
--- a/LayoutTests/fast/flexbox/010.html
+++ b/LayoutTests/fast/flexbox/010.html
@@ -6,7 +6,7 @@ div.box {
width:100px;
background-color:red;
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
position: relative;
}
diff --git a/LayoutTests/fast/flexbox/011.html b/LayoutTests/fast/flexbox/011.html
index 1b8a4eb..60eb677 100644
--- a/LayoutTests/fast/flexbox/011.html
+++ b/LayoutTests/fast/flexbox/011.html
@@ -3,7 +3,7 @@
<style>
div {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
}
@@ -14,7 +14,7 @@ div.strut {
div.flex {
-moz-box-flex: 1;
- -khtml-box-flex: 1;
+ -webkit-box-flex: 1;
box-flex: 1;
border: 2px solid purple;
margin: 2px;
diff --git a/LayoutTests/fast/flexbox/012.html b/LayoutTests/fast/flexbox/012.html
index 45cf08a..7708418 100644
--- a/LayoutTests/fast/flexbox/012.html
+++ b/LayoutTests/fast/flexbox/012.html
@@ -3,7 +3,7 @@
<style>
div {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
}
@@ -12,10 +12,10 @@ div.outer {
height: 100px;
background-color: red;
-moz-box-orient: vertical;
- -khtml-box-orient: vertical;
+ -webkit-box-orient: vertical;
box-orient: vertical;
-moz-box-align: center;
- -khtml-box-align: center;
+ -webkit-box-align: center;
box-align: center;
position: relative;
}
diff --git a/LayoutTests/fast/flexbox/013.html b/LayoutTests/fast/flexbox/013.html
index 1246b70..8177899 100644
--- a/LayoutTests/fast/flexbox/013.html
+++ b/LayoutTests/fast/flexbox/013.html
@@ -3,7 +3,7 @@
<style>
div {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
width: 100px;
height: 100px;
@@ -16,7 +16,7 @@ div.outer {
div.inner {
background-color:green;
-moz-box-flex: 1;
- -khtml-box-flex: 1;
+ -webkit-box-flex: 1;
box-flex: 1;
width:10px;
height:100px;
diff --git a/LayoutTests/fast/flexbox/014.html b/LayoutTests/fast/flexbox/014.html
index 56f98e0..0e08c37 100644
--- a/LayoutTests/fast/flexbox/014.html
+++ b/LayoutTests/fast/flexbox/014.html
@@ -3,12 +3,12 @@
<style>
div {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
width: 100px;
height: 100px;
-moz-box-orient: vertical;
- -khtml-box-orient: vertical;
+ -webkit-box-orient: vertical;
box-orient: vertical;
}
@@ -19,7 +19,7 @@ div.outer {
div.inner {
background-color:green;
-moz-box-flex: 1;
- -khtml-box-flex: 1;
+ -webkit-box-flex: 1;
box-flex: 1;
width:100px;
height:10px;
diff --git a/LayoutTests/fast/flexbox/015.html b/LayoutTests/fast/flexbox/015.html
index 0fb2543..b033b6f 100644
--- a/LayoutTests/fast/flexbox/015.html
+++ b/LayoutTests/fast/flexbox/015.html
@@ -3,7 +3,7 @@
<style>
div {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
}
@@ -11,14 +11,14 @@ div.outer {
background-color:red;
height: 100px;
-moz-box-flex: 1;
- -khtml-box-flex: 1;
+ -webkit-box-flex: 1;
box-flex: 1;
max-width: 100px;
}
div.sides {
-moz-box-flex: 1;
- -khtml-box-flex: 1;
+ -webkit-box-flex: 1;
box-flex: 1;
background-color: red;
}
diff --git a/LayoutTests/fast/flexbox/016.html b/LayoutTests/fast/flexbox/016.html
index 73fb282..1cf3f48 100644
--- a/LayoutTests/fast/flexbox/016.html
+++ b/LayoutTests/fast/flexbox/016.html
@@ -4,7 +4,7 @@
.middle {
background-color:green;
-moz-box-flex: 1;
- -khtml-box-flex: 1;
+ -webkit-box-flex: 1;
box-flex: 1;
border: 10px solid olive;
}
@@ -21,10 +21,10 @@ body {
div.outer {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
-moz-box-orient: vertical;
- -khtml-box-orient: vertical;
+ -webkit-box-orient: vertical;
box-orient: vertical;
height: 100%;
width: 100%;
diff --git a/LayoutTests/fast/flexbox/017.html b/LayoutTests/fast/flexbox/017.html
index ee99fcb..b3b5914 100644
--- a/LayoutTests/fast/flexbox/017.html
+++ b/LayoutTests/fast/flexbox/017.html
@@ -3,13 +3,13 @@
<style>
div.box {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
}
div.vertical {
-moz-box-orient: vertical;
- -khtml-box-orient: vertical;
+ -webkit-box-orient: vertical;
box-orient: vertical;
}
@@ -21,44 +21,44 @@ div.number {
.rtl {
-moz-box-pack: end;
- -khtml-box-pack: end;
+ -webkit-box-pack: end;
box-pack: end;
direction: rtl;
}
.rev {
-moz-box-direction: reverse;
- -khtml-box-direction: reverse;
+ -webkit-box-direction: reverse;
box-direction: reverse;
}
.first {
-moz-box-ordinal-group: 1;
- -khtml-box-ordinal-group: 1;
+ -webkit-box-ordinal-group: 1;
box-ordinal-group: 1
}
.second {
-moz-box-ordinal-group: 2;
- -khtml-box-ordinal-group: 2;
+ -webkit-box-ordinal-group: 2;
box-ordinal-group: 2
}
.third {
-moz-box-ordinal-group: 3;
- -khtml-box-ordinal-group: 3;
+ -webkit-box-ordinal-group: 3;
box-ordinal-group: 3
}
.fourth {
-moz-box-ordinal-group: 4;
- -khtml-box-ordinal-group: 4;
+ -webkit-box-ordinal-group: 4;
box-ordinal-group: 4
}
.fifth {
-moz-box-ordinal-group: 5;
- -khtml-box-ordinal-group: 5;
+ -webkit-box-ordinal-group: 5;
box-ordinal-group: 5
}
diff --git a/LayoutTests/fast/flexbox/018.html b/LayoutTests/fast/flexbox/018.html
index 2e25975..60d5c5b 100644
--- a/LayoutTests/fast/flexbox/018.html
+++ b/LayoutTests/fast/flexbox/018.html
@@ -3,16 +3,16 @@
<style>
div {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
}
.strip {
-moz-box-orient: vertical;
- -khtml-box-orient: vertical;
+ -webkit-box-orient: vertical;
box-orient: vertical;
-moz-box-pack: justify;
- -khtml-box-pack: justify;
+ -webkit-box-pack: justify;
box-pack: justify;
}
diff --git a/LayoutTests/fast/flexbox/019.html b/LayoutTests/fast/flexbox/019.html
index 98a6476..035c1e2 100644
--- a/LayoutTests/fast/flexbox/019.html
+++ b/LayoutTests/fast/flexbox/019.html
@@ -3,13 +3,13 @@
<style>
div {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
}
.strip {
-moz-box-pack: justify;
- -khtml-box-pack: justify;
+ -webkit-box-pack: justify;
box-pack: justify;
}
@@ -22,7 +22,7 @@ div {
width: 350px;
height: 350px;
-moz-box-orient: vertical;
- -khtml-box-orient: vertical;
+ -webkit-box-orient: vertical;
box-orient: vertical;
}
diff --git a/LayoutTests/fast/flexbox/020.html b/LayoutTests/fast/flexbox/020.html
index 6fd2d14..14fc969 100644
--- a/LayoutTests/fast/flexbox/020.html
+++ b/LayoutTests/fast/flexbox/020.html
@@ -3,27 +3,27 @@
<style>
div {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
}
.first {
-moz-box-flex-group: 1;
- -khtml-box-flex-group: 1;
+ -webkit-box-flex-group: 1;
box-flex-group: 1;
background-color: green;
-moz-box-flex: 1;
- -khtml-box-flex: 1;
+ -webkit-box-flex: 1;
box-flex: 1;
}
.second {
-moz-box-flex-group: 2;
- -khtml-box-flex-group: 2;
+ -webkit-box-flex-group: 2;
box-flex-group: 2;
background-color: red;
-moz-box-flex: 1;
- -khtml-box-flex: 1;
+ -webkit-box-flex: 1;
box-flex: 1;
}
</style>
diff --git a/LayoutTests/fast/flexbox/021.html b/LayoutTests/fast/flexbox/021.html
index b5c1612..4f7f49e 100644
--- a/LayoutTests/fast/flexbox/021.html
+++ b/LayoutTests/fast/flexbox/021.html
@@ -3,7 +3,7 @@
<style>
div {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
background-color: red;
width: 100px;
@@ -13,7 +13,7 @@ div {
.first {
visibility: collapse;
-moz-box-flex: 1;
- -khtml-box-flex: 1;
+ -webkit-box-flex: 1;
box-flex: 1;
width: 50px;
height: 100px;
@@ -22,7 +22,7 @@ div {
.second {
background-color: green;
-moz-box-flex: 1;
- -khtml-box-flex: 1;
+ -webkit-box-flex: 1;
box-flex: 1;
width: 50px;
height: 100px;
diff --git a/LayoutTests/fast/flexbox/022.html b/LayoutTests/fast/flexbox/022.html
index ee63e3e..15049e3 100644
--- a/LayoutTests/fast/flexbox/022.html
+++ b/LayoutTests/fast/flexbox/022.html
@@ -3,7 +3,7 @@
<style>
div {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
background-color: green;
width: 100px;
@@ -12,7 +12,7 @@ div {
span {
-moz-box-flex: 1;
- -khtml-box-flex: 1;
+ -webkit-box-flex: 1;
box-flex: 1;
height: 100px;
background-color: red;
diff --git a/LayoutTests/fast/flexbox/023.html b/LayoutTests/fast/flexbox/023.html
index baab2a5..28b1b27 100644
--- a/LayoutTests/fast/flexbox/023.html
+++ b/LayoutTests/fast/flexbox/023.html
@@ -3,7 +3,7 @@
<style>
div {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
width: 100px;
height: 100px;
diff --git a/LayoutTests/fast/flexbox/024.html b/LayoutTests/fast/flexbox/024.html
index 8712ef4..96e6fdc 100644
--- a/LayoutTests/fast/flexbox/024.html
+++ b/LayoutTests/fast/flexbox/024.html
@@ -3,12 +3,12 @@
<style>
div {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
width: 100px;
height: 100px;
-moz-box-orient: vertical;
- -khtml-box-orient: vertical;
+ -webkit-box-orient: vertical;
box-orient: vertical;
}
diff --git a/LayoutTests/fast/flexbox/025.html b/LayoutTests/fast/flexbox/025.html
index b136633..dc76db8 100644
--- a/LayoutTests/fast/flexbox/025.html
+++ b/LayoutTests/fast/flexbox/025.html
@@ -1,5 +1,5 @@
-<html style="display: -moz-box; display: -khtml-box; display: box; height:100%; background-color:white">
-<body style="margin: 0; display: -moz-box; display: -khtml-box; display: box; -moz-box-flex: 1; -khtml-box-flex: 1; box-flex: 1; background-color:green; color:white">
+<html style="display: -moz-box; display: -webkit-box; display: box; height:100%; background-color:white">
+<body style="margin: 0; display: -moz-box; display: -webkit-box; display: box; -moz-box-flex: 1; -webkit-box-flex: 1; box-flex: 1; background-color:green; color:white">
You should see white text on a green background that fills the window.
</body>
</html>
diff --git a/LayoutTests/fast/flexbox/026.html b/LayoutTests/fast/flexbox/026.html
index 0502370..bac8f6e 100644
--- a/LayoutTests/fast/flexbox/026.html
+++ b/LayoutTests/fast/flexbox/026.html
@@ -1,7 +1,7 @@
<style type="text/css">
#file {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
background-color: blue;
width: 300px;
@@ -10,7 +10,7 @@
#but {
-moz-box-flex: 2;
- -khtml-box-flex: 2;
+ -webkit-box-flex: 2;
box-flex: 2;
height: 100px;
background-color: red;
@@ -20,7 +20,7 @@
#name {
-moz-box-flex: 3;
- -khtml-box-flex: 3;
+ -webkit-box-flex: 3;
box-flex: 3;
height: 100px;
background-color: green;
diff --git a/LayoutTests/fast/flexbox/child-flexing.html b/LayoutTests/fast/flexbox/child-flexing.html
index 050e73a..dac7316 100644
--- a/LayoutTests/fast/flexbox/child-flexing.html
+++ b/LayoutTests/fast/flexbox/child-flexing.html
@@ -5,7 +5,7 @@
<style>
div.box {
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
}
@@ -14,20 +14,20 @@ div.outer {
height: 100px;
background-color: red;
-moz-box-align: top;
- -khtml-box-align: top;
+ -webkit-box-align: top;
position: relative;
overflow: auto;
}
div.vertical {
-moz-box-orient: vertical;
- -khtml-box-orient: vertical;
+ -webkit-box-orient: vertical;
box-orient: vertical;
}
div.horizontal {
-moz-box-orient: horizontal;
- -khtml-box-orient: horizontal;
+ -webkit-box-orient: horizontal;
box-orient: horizontal;
}
diff --git a/LayoutTests/fast/repaint/flexible-box-overflow-horizontal.html b/LayoutTests/fast/repaint/flexible-box-overflow-horizontal.html
index ca256e7..e16a170 100644
--- a/LayoutTests/fast/repaint/flexible-box-overflow-horizontal.html
+++ b/LayoutTests/fast/repaint/flexible-box-overflow-horizontal.html
@@ -12,22 +12,22 @@ div.flexbox {
width: 80px;
background-color: yellow;
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
-moz-box-align: center;
- -khtml-box-align: center;
+ -webkit-box-align: center;
box-align: center;
}
div.horizontal {
-moz-box-orient: horizontal;
- -khtml-box-orient: horizontal;
+ -webkit-box-orient: horizontal;
box-orient: horizontal;
}
div.vertical {
-moz-box-orient: vertical;
- -khtml-box-orient: vertical;
+ -webkit-box-orient: vertical;
box-orient: vertical;
}
diff --git a/LayoutTests/fast/repaint/flexible-box-overflow.html b/LayoutTests/fast/repaint/flexible-box-overflow.html
index 89a908f..208ee00 100644
--- a/LayoutTests/fast/repaint/flexible-box-overflow.html
+++ b/LayoutTests/fast/repaint/flexible-box-overflow.html
@@ -10,22 +10,22 @@ div.flexbox {
width: 80px;
background-color: yellow;
display: -moz-box;
- display: -khtml-box;
+ display: -webkit-box;
display: box;
-moz-box-align: center;
- -khtml-box-align: center;
+ -webkit-box-align: center;
box-align: center;
}
div.horizontal {
-moz-box-orient: horizontal;
- -khtml-box-orient: horizontal;
+ -webkit-box-orient: horizontal;
box-orient: horizontal;
}
div.vertical {
-moz-box-orient: vertical;
- -khtml-box-orient: vertical;
+ -webkit-box-orient: vertical;
box-orient: vertical;
}
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 971779e..522bac3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-21 Peter Beverloo <peter at 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):
+
2010-07-21 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
index bd5db44..ce1f05f 100644
--- a/WebCore/css/CSSParser.cpp
+++ b/WebCore/css/CSSParser.cpp
@@ -5610,31 +5610,27 @@ static int cssPropertyID(const UChar* propertyName, unsigned length)
const char* name = buffer;
if (buffer[0] == '-') {
- // If the prefix is -apple- or -khtml-, change it to -webkit-.
- // This makes the string one character longer.
- if (hasPrefix(buffer, length, "-apple-") || hasPrefix(buffer, length, "-khtml-")) {
+ if (!strcmp(buffer, "-apple-dashboard-region") || !strcmp(buffer, "-apple-line-clamp")) {
+ // Support two Apple-specific CSS properties previously used for
+ // the Dashboard and Safari RSS line clamping.
memmove(buffer + 7, buffer + 6, length + 1 - 6);
memcpy(buffer, "-webkit", 7);
++length;
- }
-
- if (hasPrefix(buffer, length, "-webkit")) {
- if (strcmp(buffer, "-webkit-opacity") == 0) {
- // Honor -webkit-opacity as a synonym for opacity.
- // This was the only syntax that worked in Safari 1.1, and may be in use on some websites and widgets.
- const char* const opacity = "opacity";
- name = opacity;
- length = strlen(opacity);
- } else if (hasPrefix(buffer + 7, length - 7, "-border-")) {
- // -webkit-border-*-*-radius worked in Safari 4 and earlier. -webkit-border-radius syntax
- // differs from border-radius, so it is remains as a distinct property.
- if (!strcmp(buffer + 15, "top-left-radius")
- || !strcmp(buffer + 15, "top-right-radius")
- || !strcmp(buffer + 15, "bottom-right-radius")
- || !strcmp(buffer + 15, "bottom-left-radius")) {
- name = buffer + 8;
- length -= 8;
- }
+ } else if (!strcmp(buffer, "-webkit-opacity")) {
+ // Honor -webkit-opacity as a synonym for opacity. This was the only
+ // syntax that worked in Safari 1.1, and may be in use on some websites and widgets.
+ const char* const opacity = "opacity";
+ name = opacity;
+ length = 7;
+ } else if (hasPrefix(buffer, length, "-webkit-border-")) {
+ // -webkit-border-*-*-radius worked in Safari 4 and earlier. -webkit-border-radius syntax
+ // differs from border-radius, so it remains as a distinct property.
+ if (!strcmp(buffer + 15, "top-left-radius")
+ || !strcmp(buffer + 15, "top-right-radius")
+ || !strcmp(buffer + 15, "bottom-right-radius")
+ || !strcmp(buffer + 15, "bottom-left-radius")) {
+ name = buffer + 8;
+ length -= 8;
}
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list