[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
hamaji at chromium.org
hamaji at chromium.org
Thu Oct 29 20:49:02 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit b593830614940dddb8d5e1b3c9cdb2948156f3e5
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 20 18:46:04 2009 +0000
2009-10-20 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Darin Adler.
fast/css/getComputedStyle/marginComputedStyle is missing
https://bugs.webkit.org/show_bug.cgi?id=30566
* fast/css/getComputedStyle/marginComputedStyle-expected.txt: Added.
* fast/css/getComputedStyle/marginComputedStyle.html: Added.
* platform/mac/fast/css/getComputedStyle/marginComputedStyle-expected.checksum: Removed.
* platform/mac/fast/css/getComputedStyle/marginComputedStyle-expected.png: Removed.
* platform/mac/fast/css/getComputedStyle/marginComputedStyle-expected.txt: Removed.
* platform/qt/fast/css/marginComputedStyle-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49875 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index fa6be6a..5ceb03c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2009-10-20 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ fast/css/getComputedStyle/marginComputedStyle is missing
+ https://bugs.webkit.org/show_bug.cgi?id=30566
+
+ * fast/css/getComputedStyle/marginComputedStyle-expected.txt: Added.
+ * fast/css/getComputedStyle/marginComputedStyle.html: Added.
+ * platform/mac/fast/css/getComputedStyle/marginComputedStyle-expected.checksum: Removed.
+ * platform/mac/fast/css/getComputedStyle/marginComputedStyle-expected.png: Removed.
+ * platform/mac/fast/css/getComputedStyle/marginComputedStyle-expected.txt: Removed.
+ * platform/qt/fast/css/marginComputedStyle-expected.txt: Removed.
+
2009-10-20 Xan Lopez <xlopez at igalia.com>
Another batch of skipped tests with links to their bugs.
diff --git a/LayoutTests/fast/css/getComputedStyle/marginComputedStyle-expected.txt b/LayoutTests/fast/css/getComputedStyle/marginComputedStyle-expected.txt
new file mode 100644
index 0000000..21c3bc3
--- /dev/null
+++ b/LayoutTests/fast/css/getComputedStyle/marginComputedStyle-expected.txt
@@ -0,0 +1,10 @@
+Test
+width: 392px
+height: 28px
+margin-left: 186px
+margin-right: 186px
+margin-top: 0px
+margin-bottom: 0px
+padding-left: 0px
+left: auto
+
diff --git a/LayoutTests/fast/css/getComputedStyle/marginComputedStyle.html b/LayoutTests/fast/css/getComputedStyle/marginComputedStyle.html
new file mode 100644
index 0000000..fd4a7ba
--- /dev/null
+++ b/LayoutTests/fast/css/getComputedStyle/marginComputedStyle.html
@@ -0,0 +1,49 @@
+<html>
+<head>
+<style>
+div {
+ background: purple;
+ border: 10px double #000000;
+ width:50%;
+ height:auto;
+ margin-left:auto;
+ margin-right:auto;
+ margin-top:auto;
+ margin-bottom:auto;
+ padding-left:auto;
+ left: auto;
+ color: white;
+ font: 24px 'Lucida Grande';
+}
+</style>
+</head>
+
+<body>
+<div id="foo">Test</div>
+
+<script>
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+
+ var foodiv = document.getElementById('foo');
+ document.write("width: " + window.getComputedStyle(foodiv, null).getPropertyValue("width"));
+ document.write( "<br>");
+ document.write("height: " + window.getComputedStyle(foodiv, null).getPropertyValue("height"));
+ document.write( "<br>");
+ document.write("margin-left: " + window.getComputedStyle(foodiv, null).getPropertyValue("margin-left"));
+ document.write( "<br>");
+ document.write("margin-right: " + window.getComputedStyle(foodiv, null).getPropertyValue("margin-right"));
+ document.write( "<br>");
+ document.write("margin-top: " + window.getComputedStyle(foodiv, null).getPropertyValue("margin-top"));
+ document.write( "<br>");
+ document.write("margin-bottom: " + window.getComputedStyle(foodiv, null).getPropertyValue("margin-bottom"));
+ document.write( "<br>");
+ document.write("padding-left: " + window.getComputedStyle(foodiv, null).getPropertyValue("padding-left"));
+ document.write( "<br>");
+ document.write("left: " + window.getComputedStyle(foodiv, null).getPropertyValue("left"));
+ document.write( "<br>");
+</script>
+
+</body>
+
+</html>
diff --git a/LayoutTests/platform/mac/fast/css/getComputedStyle/marginComputedStyle-expected.checksum b/LayoutTests/platform/mac/fast/css/getComputedStyle/marginComputedStyle-expected.checksum
deleted file mode 100644
index ed8cba8..0000000
--- a/LayoutTests/platform/mac/fast/css/getComputedStyle/marginComputedStyle-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-0b710acb9d4cbc78294dd0ab364864b5
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/getComputedStyle/marginComputedStyle-expected.png b/LayoutTests/platform/mac/fast/css/getComputedStyle/marginComputedStyle-expected.png
deleted file mode 100644
index 1028eaa..0000000
Binary files a/LayoutTests/platform/mac/fast/css/getComputedStyle/marginComputedStyle-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/getComputedStyle/marginComputedStyle-expected.txt b/LayoutTests/platform/mac/fast/css/getComputedStyle/marginComputedStyle-expected.txt
deleted file mode 100644
index b76874c..0000000
--- a/LayoutTests/platform/mac/fast/css/getComputedStyle/marginComputedStyle-expected.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (186,0) size 412x48 [color=#FFFFFF] [bgcolor=#800080] [border: (10px double #000000)]
- RenderText {#text} at (10,10) size 50x28
- text run at (10,10) width 50: "Test"
- RenderBlock (anonymous) at (0,48) size 784x144
- RenderText {#text} at (0,0) size 84x18
- text run at (0,0) width 84: "width: 392px"
- RenderBR {BR} at (84,14) size 0x0
- RenderText {#text} at (0,18) size 79x18
- text run at (0,18) width 79: "height: 28px"
- RenderBR {BR} at (79,32) size 0x0
- RenderText {#text} at (0,36) size 117x18
- text run at (0,36) width 117: "margin-left: 186px"
- RenderBR {BR} at (117,50) size 0x0
- RenderText {#text} at (0,54) size 126x18
- text run at (0,54) width 126: "margin-right: 186px"
- RenderBR {BR} at (126,68) size 0x0
- RenderText {#text} at (0,72) size 101x18
- text run at (0,72) width 101: "margin-top: 0px"
- RenderBR {BR} at (101,86) size 0x0
- RenderText {#text} at (0,90) size 125x18
- text run at (0,90) width 125: "margin-bottom: 0px"
- RenderBR {BR} at (125,104) size 0x0
- RenderText {#text} at (0,108) size 108x18
- text run at (0,108) width 108: "padding-left: 0px"
- RenderBR {BR} at (108,122) size 0x0
- RenderText {#text} at (0,126) size 55x18
- text run at (0,126) width 55: "left: auto"
- RenderBR {BR} at (55,140) size 0x0
diff --git a/LayoutTests/platform/qt/fast/css/marginComputedStyle-expected.txt b/LayoutTests/platform/qt/fast/css/marginComputedStyle-expected.txt
deleted file mode 100644
index 99dd07f..0000000
--- a/LayoutTests/platform/qt/fast/css/marginComputedStyle-expected.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (186,0) size 412x52 [color=#FFFFFF] [bgcolor=#800080] [border: (10px double #000000)]
- RenderText {#text} at (10,10) size 47x31
- text run at (10,10) width 47: "Test"
- RenderBlock (anonymous) at (0,52) size 784x152
- RenderText {#text} at (0,0) size 80x19
- text run at (0,0) width 80: "width: 392px"
- RenderBR {BR} at (80,14) size 0x0
- RenderText {#text} at (0,19) size 78x19
- text run at (0,19) width 78: "height: 32px"
- RenderBR {BR} at (78,33) size 0x0
- RenderText {#text} at (0,38) size 115x19
- text run at (0,38) width 115: "margin-left: 186px"
- RenderBR {BR} at (115,52) size 0x0
- RenderText {#text} at (0,57) size 124x19
- text run at (0,57) width 124: "margin-right: 186px"
- RenderBR {BR} at (124,71) size 0x0
- RenderText {#text} at (0,76) size 100x19
- text run at (0,76) width 100: "margin-top: 0px"
- RenderBR {BR} at (100,90) size 0x0
- RenderText {#text} at (0,95) size 124x19
- text run at (0,95) width 124: "margin-bottom: 0px"
- RenderBR {BR} at (124,109) size 0x0
- RenderText {#text} at (0,114) size 106x19
- text run at (0,114) width 106: "padding-left: 0px"
- RenderBR {BR} at (106,128) size 0x0
- RenderText {#text} at (0,133) size 55x19
- text run at (0,133) width 55: "left: auto"
- RenderBR {BR} at (55,147) size 0x0
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list