[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
ossy at webkit.org
ossy at webkit.org
Thu Apr 8 00:52:09 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 81306ad0038d929f85ea39774b39c4545b4d67cb
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 30 10:46:28 2009 +0000
Rubber-stamped by Holger Hans Peter Freyther.
Patch by Andras Becsi <abecsi at inf.u-szeged.hu> on 2009-12-30
[Qt] Add expected files for the following new passing tests.
* platform/qt/editing/selection/select-text-overflow-ellipsis-expected.txt: Added.
* platform/qt/fast/block/float/in-margin-expected.txt: Copied from LayoutTests/platform/mac/fast/block/float/in-margin-expected.txt.
* platform/qt/fast/text/fake-italic-expected.txt: Added.
* platform/qt/svg/custom/empty-mask-expected.txt: Added.
* platform/qt/svg/filters/filter-source-position-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52652 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 55c2163..fd46d28 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-30 Andras Becsi <abecsi at inf.u-szeged.hu>
+
+ Rubber-stamped by Holger Hans Peter Freyther.
+
+ [Qt] Add expected files for the following new passing tests.
+
+ * platform/qt/editing/selection/select-text-overflow-ellipsis-expected.txt: Added.
+ * platform/qt/fast/block/float/in-margin-expected.txt: Copied from LayoutTests/platform/mac/fast/block/float/in-margin-expected.txt.
+ * platform/qt/fast/text/fake-italic-expected.txt: Added.
+ * platform/qt/svg/custom/empty-mask-expected.txt: Added.
+ * platform/qt/svg/filters/filter-source-position-expected.txt: Added.
+
2009-12-30 Csaba Osztrogonác <ossy at webkit.org>
Reviewed by Dirk Schulze.
diff --git a/LayoutTests/platform/qt/editing/selection/select-text-overflow-ellipsis-expected.txt b/LayoutTests/platform/qt/editing/selection/select-text-overflow-ellipsis-expected.txt
new file mode 100644
index 0000000..56bdfa0
--- /dev/null
+++ b/LayoutTests/platform/qt/editing/selection/select-text-overflow-ellipsis-expected.txt
@@ -0,0 +1,20 @@
+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 {H3} at (0,0) size 784x48
+ RenderText {#text} at (0,0) size 76x24
+ text run at (0,0) width 76: "Test for "
+ RenderInline {A} at (0,0) size 167x24 [color=#0000EE]
+ RenderText {#text} at (76,0) size 167x24
+ text run at (76,0) width 167: "WebKit bug 29968"
+ RenderText {#text} at (243,0) size 775x48
+ text run at (243,0) width 532: ": Selecting text with text-overflow ellipsis should not show"
+ text run at (0,24) width 97: "cut off text"
+layer at (8,74) size 95x20 scrollWidth 132
+ RenderBlock {DIV} at (0,66) size 95x20
+ RenderText {#text} at (0,0) size 132x20
+ text run at (0,0) width 132: "Lorem ipsum dolor"
+selection start: position 0 of child 0 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end: position 11 of child 0 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/mac/fast/block/float/in-margin-expected.txt b/LayoutTests/platform/qt/fast/block/float/in-margin-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/block/float/in-margin-expected.txt
copy to LayoutTests/platform/qt/fast/block/float/in-margin-expected.txt
diff --git a/LayoutTests/platform/qt/fast/text/fake-italic-expected.txt b/LayoutTests/platform/qt/fast/text/fake-italic-expected.txt
new file mode 100644
index 0000000..8dcfc06
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/text/fake-italic-expected.txt
@@ -0,0 +1,13 @@
+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 784x576
+ RenderBlock {P} at (0,0) size 784x60
+ RenderText {#text} at (0,0) size 757x60
+ text run at (0,0) width 757: "This layout test is designed to test that our fake italic mode is working correctly. The Ahem font, used below,"
+ text run at (0,20) width 754: "does not include an italic variant. Thus, when we ask for italic Ahem, we should skew the glyphs ourselves,"
+ text run at (0,40) width 332: "resulting in a series of italic black boxes below."
+ RenderBlock {P} at (0,76) size 784x16
+ RenderText {#text} at (0,0) size 128x16
+ text run at (0,0) width 128: "A A A A"
diff --git a/LayoutTests/platform/qt/svg/custom/empty-mask-expected.txt b/LayoutTests/platform/qt/svg/custom/empty-mask-expected.txt
new file mode 100644
index 0000000..08cb8d9
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/custom/empty-mask-expected.txt
@@ -0,0 +1,13 @@
+KCanvasResource {id="mask" [type=MASKER]}
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderSVGRoot {svg} at (20,20) size 100x100
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+ RenderSVGContainer {mask} at (-0.50,-0.50) size 0.10x0.10
+ RenderPath {rect} at (-0.50,-0.50) size 0.10x0.10 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M -0.5 -0.5L -0.4 -0.5L -0.4 -0.4L -0.5 -0.4L -0.5 -0.5"]
+ RenderPath {rect} at (20,20) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M 20 20L 120 20L 120 120L 20 120L 20 20"]
+ RenderSVGText {text} at (60,60) size 25x20 contains 1 chunk(s)
+ RenderSVGTSpan {tspan} at (0,0) size 25x20
+ RenderSVGInlineText {#text} at (0,-16) size 25x20
+ chunk 1 text run 1 at (60.00,60.00) startOffset 0 endOffset 4 width 25.00: "test"
diff --git a/LayoutTests/platform/qt/svg/filters/filter-source-position-expected.txt b/LayoutTests/platform/qt/svg/filters/filter-source-position-expected.txt
new file mode 100644
index 0000000..29c0aaa
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/filters/filter-source-position-expected.txt
@@ -0,0 +1,22 @@
+KCanvasResource {id="filter1" [type=FILTER] [bounding box=at (0,0) size 0x0] [bounding box mode=0]}
+KCanvasResource {id="filter2" [type=FILTER] [bounding box=at (0,0) size 0x0] [bounding box mode=0]}
+KCanvasResource {id="filter3" [type=FILTER] [bounding box=at (0,0) size 0x0] [bounding box mode=0]}
+KCanvasResource {id="filter4" [type=FILTER] [bounding box=at (0,0) size 0x0] [bounding box mode=0]}
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderSVGRoot {svg} at (42,42) size 196x196
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+ RenderSVGImage {image} at (20,20) size 110x110
+ RenderSVGContainer {use} at (42,42) size 88x88 [filter=filter1]
+ RenderSVGContainer {g} at (20,20) size 110x110
+ RenderSVGImage {image} at (20,20) size 110x110
+ RenderSVGContainer {use} at (128,42) size 110x88 [filter=filter2]
+ RenderSVGContainer {g} at (150,20) size 110x110 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,0.00)}]
+ RenderSVGImage {image} at (150,20) size 110x110
+ RenderSVGContainer {use} at (42,128) size 88x110 [filter=filter3]
+ RenderSVGContainer {g} at (20,150) size 110x110 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,130.00)}]
+ RenderSVGImage {image} at (20,150) size 110x110
+ RenderSVGContainer {use} at (128,128) size 110x110 [filter=filter4]
+ RenderSVGContainer {g} at (150,150) size 110x110 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,130.00)}]
+ RenderSVGImage {image} at (150,150) size 110x110
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list