Skip to content

Commit

Permalink
2010-07-21 Peter Beverloo <peter@lvp-media.com>
Browse files Browse the repository at this point in the history
        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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63854 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
commit-queue@webkit.org committed Jul 21, 2010
1 parent 65865bf commit a659cc2
Show file tree
Hide file tree
Showing 40 changed files with 247 additions and 159 deletions.
47 changes: 47 additions & 0 deletions LayoutTests/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,50 @@
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 Sam Weinig <sam@webkit.org>

Reviewed by Anders Carlsson.
Expand Down
2 changes: 1 addition & 1 deletion LayoutTests/fast/block/positioning/height-change.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
38 changes: 19 additions & 19 deletions LayoutTests/fast/borders/border-image-omit-right-slice.html
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions LayoutTests/fast/css/apple-prefix.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<style>
.content {
overflow: hidden;
display: -khtml-box;
-khtml-box-orient: vertical;
display: -webkit-box;
-webkit-box-orient: vertical;
}
</style>
</head>
Expand Down
12 changes: 0 additions & 12 deletions LayoutTests/fast/css/legacy-opacity-styles-expected.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
16 changes: 0 additions & 16 deletions LayoutTests/fast/css/legacy-opacity-styles.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,16 @@
</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>
<script>
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;
Expand Down
23 changes: 23 additions & 0 deletions LayoutTests/fast/css/limited-vendor-prefix-behavior-expected.txt
Original file line number Diff line number Diff line change
@@ -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

38 changes: 38 additions & 0 deletions LayoutTests/fast/css/limited-vendor-prefix-behavior.html
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions LayoutTests/fast/flexbox/001.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<style>
div {
display: -moz-box;
display: -khtml-box;
display: -webkit-box;
display: box;
width: 100px;
height: 100px;
Expand All @@ -18,7 +18,7 @@
div.inner {
background-color:green;
-moz-box-flex: 1;
-khtml-box-flex: 1;
-webkit-box-flex: 1;
box-flex: 1;
width:10px;
height:100px;
Expand Down
6 changes: 3 additions & 3 deletions LayoutTests/fast/flexbox/002.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
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;
}

Expand Down
6 changes: 3 additions & 3 deletions LayoutTests/fast/flexbox/003.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
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;
}

Expand Down
2 changes: 1 addition & 1 deletion LayoutTests/fast/flexbox/004.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
width: 100px;
background-color:red;
display: -moz-box;
display: -khtml-box;
display: -webkit-box;
display: box;
}

Expand Down
2 changes: 1 addition & 1 deletion LayoutTests/fast/flexbox/005.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
height: 100px;
background-color:green;
display: -moz-box;
display: -khtml-box;
display: -webkit-box;
display: box;
width: 100%;
}
Expand Down
2 changes: 1 addition & 1 deletion LayoutTests/fast/flexbox/006.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
height: 100px;
background-color:green;
display: -moz-box;
display: -khtml-box;
display: -webkit-box;
display: box;
}

Expand Down
2 changes: 1 addition & 1 deletion LayoutTests/fast/flexbox/007.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<style>
div.box {
display: -moz-box;
display: -khtml-box;
display: -webkit-box;
display: box;
}

Expand Down
2 changes: 1 addition & 1 deletion LayoutTests/fast/flexbox/008.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<style>
div.box {
display: -moz-box;
display: -khtml-box;
display: -webkit-box;
display: box;
height: 200px;
width: 100px;
Expand Down
2 changes: 1 addition & 1 deletion LayoutTests/fast/flexbox/009.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
width:100px;
background-color:green;
display: -moz-box;
display: -khtml-box;
display: -webkit-box;
display: box;
overflow:auto;
border: 2px solid olive;
Expand Down
2 changes: 1 addition & 1 deletion LayoutTests/fast/flexbox/010.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
width:100px;
background-color:red;
display: -moz-box;
display: -khtml-box;
display: -webkit-box;
display: box;
position: relative;
}
Expand Down
Loading

0 comments on commit a659cc2

Please sign in to comment.