[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
hamaji at chromium.org
hamaji at chromium.org
Thu Apr 8 00:10:55 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 285d949b52fb0f37e61997ffa2eab802d2a8bd7a
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 2 05:50:04 2009 +0000
2009-12-01 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Eric Seidel.
Update expectations of css2.1/t1205-c56* for Qt
https://bugs.webkit.org/show_bug.cgi?id=32015
* platform/qt/Skipped:
* platform/qt/css2.1/t1205-c561-list-displ-00-b-expected.txt:
* platform/qt/css2.1/t1205-c565-list-pos-00-b-expected.txt:
* platform/qt/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51586 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 30887b4..613acd9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-01 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ Update expectations of css2.1/t1205-c56* for Qt
+ https://bugs.webkit.org/show_bug.cgi?id=32015
+
+ * platform/qt/Skipped:
+ * platform/qt/css2.1/t1205-c561-list-displ-00-b-expected.txt:
+ * platform/qt/css2.1/t1205-c565-list-pos-00-b-expected.txt:
+ * platform/qt/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt:
+
2009-12-01 Kent Tamura <tkent at chromium.org>
Reviewed by Darin Adler.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 835d25d..d1afd35 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5267,10 +5267,5 @@ transitions/transition-end-event-rendering.html
# hamaji will look into this.
editing/selection/last-empty-inline.html
-# Need to update the expectations.
-# See: https://bugs.webkit.org/show_bug.cgi?id=23264
-css2.1/t1205-c561-list-displ-00-b.html
-css2.1/t1205-c565-list-pos-00-b.html
-css2.1/t1205-c566-list-stl-00-e-ag.html
fast/block/positioning/complex-percentage-height.html
fast/lists/item-not-in-list-line-wrapping.html
diff --git a/LayoutTests/platform/qt/css2.1/t1205-c561-list-displ-00-b-expected.txt b/LayoutTests/platform/qt/css2.1/t1205-c561-list-displ-00-b-expected.txt
index bd6b9a2..f7edf20 100644
--- a/LayoutTests/platform/qt/css2.1/t1205-c561-list-displ-00-b-expected.txt
+++ b/LayoutTests/platform/qt/css2.1/t1205-c561-list-displ-00-b-expected.txt
@@ -9,8 +9,8 @@ layer at (0,0) size 800x240
text run at (0,20) width 82: "description."
RenderListItem {DIV} at (0,56) size 784x20 [color=#000080]
RenderListMarker at (0,0) size 17x20: "1"
- RenderText {#text} at (17,0) size 174x20
- text run at (17,0) width 174: " This should be line one."
+ RenderText {#text} at (17,0) size 170x20
+ text run at (17,0) width 170: "This should be line one."
RenderBlock {DIV} at (0,76) size 784x20 [color=#000080]
RenderText {#text} at (0,0) size 185x20
text run at (0,0) width 185: "2. This should be line two."
diff --git a/LayoutTests/platform/qt/css2.1/t1205-c565-list-pos-00-b-expected.txt b/LayoutTests/platform/qt/css2.1/t1205-c565-list-pos-00-b-expected.txt
index 43cf9bf..a05b772 100644
--- a/LayoutTests/platform/qt/css2.1/t1205-c565-list-pos-00-b-expected.txt
+++ b/LayoutTests/platform/qt/css2.1/t1205-c565-list-pos-00-b-expected.txt
@@ -17,6 +17,6 @@ layer at (0,0) size 800x101
RenderBlock {OL} at (80,57) size 160x20 [color=#000080] [bgcolor=#000080]
RenderListItem {LI} at (0,0) size 160x20
RenderListMarker at (0,0) size 17x20: "1"
- RenderInline {SPAN} at (0,0) size 35x20 [color=#FFFFFF]
- RenderText {#text} at (17,0) size 35x20
- text run at (17,0) width 35: " Test"
+ RenderInline {SPAN} at (0,0) size 31x20 [color=#FFFFFF]
+ RenderText {#text} at (17,0) size 31x20
+ text run at (17,0) width 31: "Test"
diff --git a/LayoutTests/platform/qt/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt b/LayoutTests/platform/qt/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt
index c9a7620..9f972ab 100644
--- a/LayoutTests/platform/qt/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt
+++ b/LayoutTests/platform/qt/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt
@@ -1,15 +1,15 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x114
- RenderBlock {HTML} at (0,0) size 800x114
- RenderBody {BODY} at (8,14) size 784x85
- RenderBlock {P} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 194x19
- text run at (0,0) width 194: "There should be no red below."
- RenderBlock {UL} at (75,34) size 96x51 [color=#00FF00] [bgcolor=#FF0000] [border: (3px solid #000000)]
+layer at (0,0) size 800x118
+ RenderBlock {HTML} at (0,0) size 800x118
+ RenderBody {BODY} at (8,16) size 784x87
+ RenderBlock {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 216x20
+ text run at (0,0) width 216: "There should be no red below."
+ RenderBlock {UL} at (75,36) size 96x51 [color=#00FF00] [bgcolor=#FF0000] [border: (3px solid #000000)]
RenderListItem {LI} at (3,3) size 90x45
- RenderListMarker at (0,0) size 45x16: "A"
- RenderText {#text} at (45,0) size 90x46
- text run at (45,0) width 30: " x"
- text run at (0,15) width 60: "x xx"
- text run at (0,30) width 90: "xx x x"
+ RenderListMarker at (0,0) size 45x14: "A"
+ RenderText {#text} at (45,0) size 90x44
+ text run at (45,0) width 45: "x x"
+ text run at (0,15) width 75: "xx xx"
+ text run at (0,30) width 45: "x x"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list