[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:59:49 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 4955742ca29991c75017ce4bf4d673cc6e480554
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 11 12:23:25 2010 +0000
Rubber-stamped by Holger Hans Peter Freyther.
Patch by Andras Becsi <abecsi at inf.u-szeged.hu> on 2010-01-11
[Qt] Add expected files for the following passing new tests.
Compared to the mac expected files these only differ in svg dumping style and font metrics.
* platform/qt/fast/repaint/block-no-inflow-children-expected.txt: Added.
* platform/qt/fast/repaint/subtree-layoutstate-transform-expected.txt: Added.
* platform/qt/svg/custom/marker-referencePoint-expected.txt: Added.
* platform/qt/svg/custom/marker-strokeWidth-changes-expected.txt: Added.
* platform/qt/svg/text/selection-background-color-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53074 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4cda854..d69735f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-11 Andras Becsi <abecsi at inf.u-szeged.hu>
+
+ Rubber-stamped by Holger Hans Peter Freyther.
+
+ [Qt] Add expected files for the following passing new tests.
+ Compared to the mac expected files these only differ in svg dumping style and font metrics.
+
+ * platform/qt/fast/repaint/block-no-inflow-children-expected.txt: Added.
+ * platform/qt/fast/repaint/subtree-layoutstate-transform-expected.txt: Added.
+ * platform/qt/svg/custom/marker-referencePoint-expected.txt: Added.
+ * platform/qt/svg/custom/marker-strokeWidth-changes-expected.txt: Added.
+ * platform/qt/svg/text/selection-background-color-expected.txt: Added.
+
2010-01-11 Csaba Osztrogonác <ossy at webkit.org>
Unreviewed typo fix.
diff --git a/LayoutTests/platform/qt/fast/repaint/block-no-inflow-children-expected.txt b/LayoutTests/platform/qt/fast/repaint/block-no-inflow-children-expected.txt
new file mode 100644
index 0000000..d6015ed
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/repaint/block-no-inflow-children-expected.txt
@@ -0,0 +1,11 @@
+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 (0,0) size 800x600
+ RenderBlock {DIV} at (0,0) size 200x200
+layer at (0,0) size 69x20
+ RenderBlock (positioned) {DIV} at (0,0) size 69x20
+ RenderBlock {DIV} at (0,0) size 69x20
+ RenderText {#text} at (0,0) size 69x20
+ text run at (0,0) width 69: "La la la la"
diff --git a/LayoutTests/platform/qt/fast/repaint/subtree-layoutstate-transform-expected.txt b/LayoutTests/platform/qt/fast/repaint/subtree-layoutstate-transform-expected.txt
new file mode 100644
index 0000000..60c87a2
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/repaint/subtree-layoutstate-transform-expected.txt
@@ -0,0 +1,14 @@
+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 784x572
+ RenderBlock {P} at (0,0) size 784x40
+ RenderText {#text} at (0,0) size 744x40
+ text run at (0,0) width 744: "Tests repaint after layout of a subtree, inside a transformed element. You should see a large green square"
+ text run at (0,20) width 47: "below."
+layer at (28,68) size 100x100
+ RenderBlock {DIV} at (20,60) size 100x100
+layer at (28,68) size 100x100
+ RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
+ RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]
diff --git a/LayoutTests/platform/qt/svg/custom/marker-referencePoint-expected.txt b/LayoutTests/platform/qt/svg/custom/marker-referencePoint-expected.txt
new file mode 100644
index 0000000..3023cf0
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/custom/marker-referencePoint-expected.txt
@@ -0,0 +1,10 @@
+KCanvasResource {id="Triangle" [type=MARKER] [angle=auto] [ref x=0.00 y=5.00]}
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 384x192
+ RenderSVGRoot {svg} at (0.48,0.48) size 383.04x191.04
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+ RenderSVGViewportContainer {marker} at (0.50,0) size 3x3
+ RenderPath {path} at (0.50,0) size 3x3 [fill={[type=SOLID] [color=#000000]}] [data="M 0 0L 10 5L 0 10L 0 0"]
+ RenderPath {rect} at (0.48,0.48) size 383.04x191.04 [stroke={[type=SOLID] [color=#0000FF] [stroke width=10.00]}] [data="M 10 10L 3990 10L 3990 1990L 10 1990L 10 10"]
+ RenderPath {path} at (96,67.20) size 174.55x83.35 [stroke={[type=SOLID] [color=#000000] [stroke width=100.00]}] [end marker=Triangle] [data="M 1000 750L 2000 750L 2500 1250"]
diff --git a/LayoutTests/platform/qt/svg/custom/marker-strokeWidth-changes-expected.txt b/LayoutTests/platform/qt/svg/custom/marker-strokeWidth-changes-expected.txt
new file mode 100644
index 0000000..e305515
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/custom/marker-strokeWidth-changes-expected.txt
@@ -0,0 +1,16 @@
+KCanvasResource {id="markerStart" [type=MARKER] [angle=0.00] [ref x=5.00 y=5.00]}
+KCanvasResource {id="markerMiddle" [type=MARKER] [angle=0.00] [ref x=5.00 y=5.00]}
+KCanvasResource {id="markerEnd" [type=MARKER] [angle=0.00] [ref x=5.00 y=5.00]}
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderSVGRoot {svg} at (122,127) size 66x66
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+ RenderSVGViewportContainer {marker} at (0,0) size 2x2
+ RenderPath {rect} at (0,0) size 2x2 [fill={[type=SOLID] [color=#FF0000]}] [data="M 0 0L 10 0L 10 10L 0 10L 0 0"]
+ RenderSVGViewportContainer {marker} at (0,0) size 2x2
+ RenderPath {circle} at (0,0) size 2x2 [fill={[type=SOLID] [color=#008000]}] [data="M 10 5L 9.99013 5.31395L 9.96057 5.62667L 9.91144 5.93691L 9.84292 6.24345L 9.75528 6.54508L 9.64888 6.84062L 9.52414 7.1289L 9.38153 7.40877L 9.22164 7.67913L 9.04508 7.93893L 8.85257 8.18712L 8.64484 8.42274L 8.42274 8.64484L 8.18712 8.85257L 7.93893 9.04508L 7.67913 9.22164L 7.40877 9.38153L 7.1289 9.52414L 6.84062 9.64888L 6.54508 9.75528L 6.24345 9.84292L 5.93691 9.91144L 5.62667 9.96057L 5.31395 9.99013L 5 10L 4.68605 9.99013L 4.37333 9.96057L 4.06309 9.91144L 3.75655 9.84292L 3.45491 9.75528L 3.15938 9.64888L 2.8711 9.52413L 2.59123 9.38153L 2.32087 9.22164L 2.06107 9.04508L 1.81288 8.85257L 1.57726 8.64484L 1.35516 8.42274L 1.14743 8.18712L 0.954915 7.93893L 0.77836 7.67913L 0.618466 7.40877L 0.475864 7.1289L 0.351117 6.84062L 0.244717 6.54508L 0.157084 6.24345L 0.0885639 5.93691L 0.0394264 5.62667L 0.00986636 5.31395L 0 5L 0.00986636 4.68605L 0.0394267 4.37333L 0.0885639 4.06309L 0.157084 3.75655L 0.244717 3.45492L 0.351118 3.15938L 0.475865 2.8711L 0.618467 2.59123L 0.778361 2.32087L 0.954915 2.06107L 1.14743 1.81288L 1.35516 1.57726L 1.57727 1.35516L 1.81288 1.14743L 2.06107 0.954914L 2.32087 0.77836L 2.59123 0.618466L 2.8711 0.475864L 3.15938 0.351117L 3.45491 0.244718L 3.75655 0.157084L 4.06309 0.0885639L 4.37333 0.0394264L 4.68605 0.00986636L 5 0L 5.31395 0.00986636L 5.62667 0.0394264L 5.93691 0.0885639L 6.24345 0.157084L 6.54509 0.244718L 6.84062 0.351118L 7.1289 0.475865L 7.40877 0.618467L 7.67913 0.778361L 7.93893 0.954916L 8.18712 1.14743L 8.42274 1.35516L 8.64484 1.57727L 8.85257 1.81288L 9.04509 2.06108L 9.22164 2.32087L 9.38153 2.59123L 9.52414 2.8711L 9.64888 3.15938L 9.75528 3.45492L 9.84292 3.75655L 9.91144 4.06309L 9.96057 4.37333L 9.99013 4.68605L 10 5"]
+ RenderSVGViewportContainer {marker} at (0,0) size 2x2
+ RenderPath {path} at (0,0) size 2x2 [fill={[type=SOLID] [color=#0000FF]}] [data="M 5 0L 10 10L 0 10L 5 0"]
+ RenderSVGContainer {g} at (122,127) size 66x66
+ RenderPath {path} at (122,127) size 66x66 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [start marker=markerStart] [middle marker=markerMiddle] [end marker=markerEnd] [data="M 130 135L 180 135L 180 185"]
diff --git a/LayoutTests/platform/qt/svg/text/selection-background-color-expected.txt b/LayoutTests/platform/qt/svg/text/selection-background-color-expected.txt
new file mode 100644
index 0000000..672738c
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/text/selection-background-color-expected.txt
@@ -0,0 +1,22 @@
+KRenderingPaintServer {id="gradient" [type=LINEAR-GRADIENT] [stops=[(0.00,#000000), (1.00,#FF0000)]] [transform={m=((0.71,0.71)(-0.71,0.71)) t=(0.00,0.00)}] [start=(0,0)] [end=(1,0)]}
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x236
+ RenderBlock {html} at (0,0) size 800x236
+ RenderBody {body} at (8,16) size 784x204
+ RenderBlock {p} at (0,0) size 784x204
+ RenderSVGRoot {svg} at (6.67,24.67) size 275.67x57.67
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+ RenderSVGHiddenContainer {linearGradient} at (0,0) size 0x0
+ RenderSVGGradientStop {stop} at (0,0) size 0x0
+ RenderSVGGradientStop {stop} at (0,0) size 0x0
+ RenderSVGContainer {g} at (6.67,24.67) size 275.67x57.67
+ RenderSVGText {text} at (0,30) size 273x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,-20) size 273x25
+ chunk 1 text run 1 at (0.00,30.00) startOffset 0 endOffset 28 width 269.00: "Should have blue background."
+ RenderSVGText {text} at (0,60) size 273x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,-20) size 273x25
+ chunk 1 text run 1 at (0.00,60.00) startOffset 0 endOffset 28 width 269.00: "Should have blue background."
+ RenderText {#text} at (0,0) size 0x0
+selection start: position 0 of child 0 {#text} of child 1 {text} of child 3 {g} of child 1 {svg} of child 1 {p} of child 3 {body} of child 0 {html} of document
+selection end: position 28 of child 0 {#text} of child 3 {text} of child 3 {g} of child 1 {svg} of child 1 {p} of child 3 {body} of child 0 {html} of document
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list