[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
abecsi at webkit.org
abecsi at webkit.org
Fri Feb 26 22:25:44 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit ca7dad98488dcedb63ba8c7e8c6a5425abf5c3d2
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 19 17:13:38 2010 +0000
[Qt] Implement textZoomIn() and textZoomOut() in DRT's EventSender, add results
for passing new tests and unskip the passing ones from the Skipped list.
https://bugs.webkit.org/show_bug.cgi?id=35159
Reviewed by Kenneth Rohde Christiansen.
WebKitTools:
* DumpRenderTree/qt/EventSenderQt.cpp:
(EventSender::textZoomIn):
(EventSender::textZoomOut):
* DumpRenderTree/qt/EventSenderQt.h:
LayoutTests:
* platform/qt/Skipped: unskip passing tests
* platform/qt/svg/custom/text-zoom-expected.txt: Added.
* platform/qt/svg/zoom: Added.
* platform/qt/svg/zoom/page: Added.
* platform/qt/svg/zoom/page/absolute-sized-document-no-scrollbars-expected.txt: Added.
* platform/qt/svg/zoom/page/absolute-sized-document-scrollbars-expected.txt: Added.
* platform/qt/svg/zoom/page/relative-sized-document-scrollbars-expected.txt: Added.
* platform/qt/svg/zoom/page/zoom-foreignObject-expected.txt: Added.
* platform/qt/svg/zoom/page/zoom-hixie-mixed-008-expected.txt: Added.
* platform/qt/svg/zoom/page/zoom-hixie-mixed-009-expected.txt: Added.
* platform/qt/svg/zoom/page/zoom-hixie-rendering-model-004-expected.txt: Added.
* platform/qt/svg/zoom/page/zoom-svg-float-border-padding-expected.txt: Added.
* platform/qt/svg/zoom/text: Added.
* platform/qt/svg/zoom/text/absolute-sized-document-no-scrollbars-expected.txt: Added.
* platform/qt/svg/zoom/text/absolute-sized-document-scrollbars-expected.txt: Added.
* platform/qt/svg/zoom/text/relative-sized-document-scrollbars-expected.txt: Added.
* platform/qt/svg/zoom/text/zoom-foreignObject-expected.txt: Added.
* platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.txt: Added.
* platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.txt: Added.
* platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.txt: Added.
* platform/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55019 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7a0e65e..ead858c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,33 @@
+2010-02-19 Andras Becsi <abecsi at webkit.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Implement textZoomIn() and textZoomOut() in DRT's EventSender, add results
+ for passing new tests and unskip the passing ones from the Skipped list.
+ https://bugs.webkit.org/show_bug.cgi?id=35159
+
+ * platform/qt/Skipped: unskip passing tests
+ * platform/qt/svg/custom/text-zoom-expected.txt: Added.
+ * platform/qt/svg/zoom: Added.
+ * platform/qt/svg/zoom/page: Added.
+ * platform/qt/svg/zoom/page/absolute-sized-document-no-scrollbars-expected.txt: Added.
+ * platform/qt/svg/zoom/page/absolute-sized-document-scrollbars-expected.txt: Added.
+ * platform/qt/svg/zoom/page/relative-sized-document-scrollbars-expected.txt: Added.
+ * platform/qt/svg/zoom/page/zoom-foreignObject-expected.txt: Added.
+ * platform/qt/svg/zoom/page/zoom-hixie-mixed-008-expected.txt: Added.
+ * platform/qt/svg/zoom/page/zoom-hixie-mixed-009-expected.txt: Added.
+ * platform/qt/svg/zoom/page/zoom-hixie-rendering-model-004-expected.txt: Added.
+ * platform/qt/svg/zoom/page/zoom-svg-float-border-padding-expected.txt: Added.
+ * platform/qt/svg/zoom/text: Added.
+ * platform/qt/svg/zoom/text/absolute-sized-document-no-scrollbars-expected.txt: Added.
+ * platform/qt/svg/zoom/text/absolute-sized-document-scrollbars-expected.txt: Added.
+ * platform/qt/svg/zoom/text/relative-sized-document-scrollbars-expected.txt: Added.
+ * platform/qt/svg/zoom/text/zoom-foreignObject-expected.txt: Added.
+ * platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.txt: Added.
+ * platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.txt: Added.
+ * platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.txt: Added.
+ * platform/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.txt: Added.
+
2010-02-19 Philippe Normand <pnormand at igalia.com>
Rubber-stamped by Gustavo Noronha Silva.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index a7221da..831f5e9 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -224,17 +224,6 @@ http/tests/cache/subresource-failover-to-network.html
# Missing layoutTestController.setSmartInsertDeleteEnabled()
editing/selection/doubleclick-beside-cr-span.html
-# Missing eventSender.textZoomIn() (and textZoomOut)
-svg/custom/text-zoom.xhtml
-svg/zoom/text/absolute-sized-document-no-scrollbars.svg
-svg/zoom/text/absolute-sized-document-scrollbars.svg
-svg/zoom/text/relative-sized-document-scrollbars.svg
-svg/zoom/text/zoom-foreignObject.svg
-svg/zoom/text/zoom-hixie-mixed-008.xml
-svg/zoom/text/zoom-hixie-mixed-009.xml
-svg/zoom/text/zoom-hixie-rendering-model-004.xhtml
-svg/zoom/text/zoom-svg-float-border-padding.xml
-
# Missing eventSender.beginDragWithFiles()
fast/dom/Window/window-postmessage-clone-frames.html
# ============================================================================= #
diff --git a/LayoutTests/platform/qt/svg/custom/text-zoom-expected.txt b/LayoutTests/platform/qt/svg/custom/text-zoom-expected.txt
new file mode 100644
index 0000000..9b3a156
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/custom/text-zoom-expected.txt
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x8
+ RenderBlock {html} at (0,0) size 800x8
+ RenderBody {body} at (8,8) size 784x0
+layer at (0,30) size 100x100
+ RenderBlock (positioned) {div} at (0,30) size 100x100 [bgcolor=#FF0000]
+layer at (0,30) size 200x205
+ RenderBlock (positioned) {div} at (0,30) size 200x200
+ RenderSVGRoot {svg} at (0,30) size 200x200
+ RenderPath {rect} at (0,30) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L50.00,0.00 L50.00,50.00 L0.00,50.00 L0.00,0.00"]
+ RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/svg/zoom/page/absolute-sized-document-no-scrollbars-expected.txt b/LayoutTests/platform/qt/svg/zoom/page/absolute-sized-document-no-scrollbars-expected.txt
new file mode 100644
index 0000000..cc340aa
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/page/absolute-sized-document-no-scrollbars-expected.txt
@@ -0,0 +1,6 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 576x432
+ RenderSVGRoot {svg} at (0,0) size 576x432
+ RenderPath {rect} at (0,0) size 576x432 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00 L479.00,1.00 L479.00,359.00 L1.00,359.00 L1.00,1.00"]
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/svg/zoom/page/absolute-sized-document-scrollbars-expected.txt b/LayoutTests/platform/qt/svg/zoom/page/absolute-sized-document-scrollbars-expected.txt
new file mode 100644
index 0000000..6145fb6
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/page/absolute-sized-document-scrollbars-expected.txt
@@ -0,0 +1,6 @@
+layer at (0,0) size 829x622
+ RenderView at (0,0) size 784x584
+layer at (0,0) size 829x622
+ RenderSVGRoot {svg} at (0,0) size 829x622
+ RenderPath {rect} at (0,0) size 829x622 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00 L479.00,1.00 L479.00,359.00 L1.00,359.00 L1.00,1.00"]
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/svg/zoom/page/relative-sized-document-scrollbars-expected.txt b/LayoutTests/platform/qt/svg/zoom/page/relative-sized-document-scrollbars-expected.txt
new file mode 100644
index 0000000..a792646
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/page/relative-sized-document-scrollbars-expected.txt
@@ -0,0 +1,6 @@
+layer at (0,0) size 1355x1009
+ RenderView at (0,0) size 784x584
+layer at (0,0) size 1355x1009
+ RenderSVGRoot {svg} at (0,0) size 1355x1009
+ RenderPath {rect} at (12,8) size 1331x993 [stroke={[type=SOLID] [color=#000000]}] [data="M7.84,5.84 L776.16,5.84 L776.16,578.16 L7.84,578.16 L7.84,5.84"]
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/svg/zoom/page/zoom-foreignObject-expected.txt b/LayoutTests/platform/qt/svg/zoom/page/zoom-foreignObject-expected.txt
new file mode 100644
index 0000000..58c2905
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/page/zoom-foreignObject-expected.txt
@@ -0,0 +1,15 @@
+layer at (0,0) size 1129x841
+ RenderView at (0,0) size 784x584
+layer at (0,0) size 1129x841
+ RenderSVGRoot {svg} at (0,0) size 1129x841
+ RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderBlock {xhtml:div} at (0,0) size 580x20
+ RenderText {#text} at (0,0) size 89x20
+ text run at (0,0) width 89: "This is a test"
+ RenderBlock (anonymous) at (0,20) size 580x20
+ RenderInline {xhtml:a} at (0,0) size 73x20 [color=#0000EE]
+ RenderText {#text} at (0,0) size 73x20
+ text run at (0,0) width 73: "and a link."
+ RenderBR {xhtml:br} at (73,0) size 0x20
+ RenderPath {rect} at (12,12) size 840x552 [stroke={[type=SOLID] [color=#008000]}] [data="M10.00,10.00 L590.00,10.00 L590.00,390.00 L10.00,390.00 L10.00,10.00"]
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/svg/zoom/page/zoom-hixie-mixed-008-expected.txt b/LayoutTests/platform/qt/svg/zoom/page/zoom-hixie-mixed-008-expected.txt
new file mode 100644
index 0000000..c162da4
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/page/zoom-hixie-mixed-008-expected.txt
@@ -0,0 +1,19 @@
+layer at (0,0) size 784x667
+ RenderView at (0,0) size 784x600
+layer at (0,0) size 784x667
+ RenderBlock {html} at (0,0) size 784x667
+ RenderBody {body} at (11,23) size 762x633
+ RenderBlock {p} at (0,0) size 762x28 [color=#000080]
+ RenderText {#text} at (0,0) size 634x28
+ text run at (0,0) width 634: "There should be a blue circle with the word \"TEST\" in it below."
+ RenderBlock (anonymous) at (0,51) size 762x582
+ RenderSVGRoot {svg} at (11,74) size 576x576
+ RenderPath {rect} at (11,74) size 576x576 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00 L400.00,0.00 L400.00,400.00 L0.00,400.00 L0.00,0.00"]
+ RenderPath {circle} at (11,74) size 576x576 [fill={[type=SOLID] [color=#000080]}] [data="M400.00,200.00 L399.61,212.56 L398.42,225.07 L396.46,237.48 L393.72,249.74 L390.21,261.80 L385.96,273.62 L380.97,285.16 L375.26,296.35 L368.87,307.17 L361.80,317.56 L354.10,327.48 L345.79,336.91 L336.91,345.79 L327.48,354.10 L317.56,361.80 L307.17,368.87 L296.35,375.26 L285.16,380.97 L273.62,385.96 L261.80,390.21 L249.74,393.72 L237.48,396.46 L225.07,398.42 L212.56,399.61 L200.00,400.00 L187.44,399.61 L174.93,398.42 L162.52,396.46 L150.26,393.72 L138.20,390.21 L126.38,385.96 L114.84,380.97 L103.65,375.26 L92.83,368.87 L82.44,361.80 L72.52,354.10 L63.09,345.79 L54.21,336.91 L45.90,327.48 L38.20,317.56 L31.13,307.17 L24.74,296.35 L19.03,285.16 L14.04,273.62 L9.79,261.80 L6.28,249.74 L3.54,237.48 L1.58,225.07 L0.39,212.56 L0.00,200.00 L0.39,187.44 L1.58,174.93 L3.54,162.52 L6.28,150.26 L9.79,138.20 L14.04,126.38 L19.03,114.84 L24.74,103.65 L31.13,92.83 L38.20,82.44 L45.90,72.52 L54.21,63.09 L63.09,54.21 L72.52,45.90 L82.44,38.20 L92.83,31.13 L103.65,24.74 L114.84,19.03 L126.38,14.04 L138.20,9.79 L150.26,6.28 L162.52,3.54 L174.93,1.58 L187.44,0.39 L200.00,0.00 L212.56,0.39 L225.07,1.58 L237.48,3.54 L249.74,6.28 L261.80,9.79 L273.62,14.04 L285.16,19.03 L296.35,24.74 L307.17,31.13 L317.56,38.20 L327.48,45.90 L336.91,54.21 L345.79,63.09 L354.10,72.52 L361.80,82.44 L368.87,92.83 L375.26,103.65 L380.97,114.84 L385.96,126.38 L390.21,138.20 L393.72,150.26 L396.46,162.52 L398.42,174.93 L399.61,187.44 L400.00,200.00"]
+ RenderForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
+ RenderBlock {div} at (0,0) size 400x62
+ RenderText {#text} at (136,0) size 128x62
+ text run at (136,0) width 128: "TEST"
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/svg/zoom/page/zoom-hixie-mixed-009-expected.txt b/LayoutTests/platform/qt/svg/zoom/page/zoom-hixie-mixed-009-expected.txt
new file mode 100644
index 0000000..b321941
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/page/zoom-hixie-mixed-009-expected.txt
@@ -0,0 +1,19 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x434
+ RenderBlock {html} at (0,0) size 800x434
+ RenderBody {body} at (11,14) size 778x406
+ RenderBlock {p} at (0,0) size 778x28 [color=#000080]
+ RenderText {#text} at (0,0) size 730x28
+ text run at (0,0) width 730: "The word \"TEST \" should appear twice below, the same size each time."
+ RenderBlock (anonymous) at (0,42) size 778x178
+ RenderSVGRoot {svg} at (11,56) size 576x172
+ RenderPath {rect} at (11,56) size 576x172 [transform={m=((10.00,0.00)(0.00,10.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#EEEEEE]}] [data="M0.00,0.00 L60.00,0.00 L60.00,12.00 L0.00,12.00 L0.00,0.00"]
+ RenderForeignObject {foreignObject} at (0,0) size 60x10
+ RenderBlock {div} at (0,0) size 60x12 [color=#000080]
+ RenderText {#text} at (0,0) size 27x12
+ text run at (0,0) width 27: "TEST"
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {div} at (0,234) size 576x172 [color=#000080] [bgcolor=#EEEEEE]
+ RenderText {#text} at (0,0) size 368x179
+ text run at (0,0) width 368: "TEST"
diff --git a/LayoutTests/platform/qt/svg/zoom/page/zoom-hixie-rendering-model-004-expected.txt b/LayoutTests/platform/qt/svg/zoom/page/zoom-hixie-rendering-model-004-expected.txt
new file mode 100644
index 0000000..67e194b
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/page/zoom-hixie-rendering-model-004-expected.txt
@@ -0,0 +1,16 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x430
+ RenderBlock {html} at (0,0) size 800x430
+ RenderBody {body} at (11,23) size 778x396
+ RenderBlock {p} at (0,0) size 778x56 [color=#000080]
+ RenderText {#text} at (0,0) size 732x56
+ text run at (0,0) width 732: "Zoom in and out. The following two squares should always be the same"
+ text run at (0,28) width 48: "size."
+ RenderBlock {div} at (0,79) size 144x144 [bgcolor=#000080]
+ RenderBlock (anonymous) at (0,246) size 778x150
+ RenderSVGRoot {svg} at (11,269) size 144x144
+ RenderPath {rect} at (11,269) size 144x144 [fill={[type=SOLID] [color=#000080]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 L0.00,0.00"]
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/svg/zoom/page/zoom-svg-float-border-padding-expected.txt b/LayoutTests/platform/qt/svg/zoom/page/zoom-svg-float-border-padding-expected.txt
new file mode 100644
index 0000000..da9926e
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/page/zoom-svg-float-border-padding-expected.txt
@@ -0,0 +1,27 @@
+layer at (0,0) size 784x775
+ RenderView at (0,0) size 784x600
+layer at (0,0) size 784x775
+ RenderBlock {html} at (0,0) size 784x775
+ RenderBody {body} at (11,11) size 762x741
+ RenderBlock (anonymous) at (0,0) size 762x56
+ RenderText {#text} at (0,0) size 758x56
+ text run at (0,0) width 382: "The two blocks should look identical. "
+ text run at (382,0) width 376: "One uses an SVG, and the other just"
+ text run at (0,28) width 257: "uses a normal HTML div."
+ RenderBlock {p} at (0,79) size 762x28
+ RenderText {#text} at (0,0) size 575x28
+ text run at (0,0) width 575: "There should be a red, white and blue pattern below this"
+ RenderSVGRoot {svg} at (53,183) size 172x172
+ RenderPath {rect} at (53,183) size 144x144 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 L0.00,0.00"]
+ RenderBlock {p} at (0,358) size 762x28
+ RenderText {#text} at (0,0) size 578x28
+ text run at (0,0) width 578: "There should be a red, white and blue pattern above this"
+ RenderBlock {hr} at (0,409) size 762x2 [border: (1px inset #000000)]
+ RenderBlock {p} at (0,434) size 762x28
+ RenderText {#text} at (0,0) size 575x28
+ text run at (0,0) width 575: "There should be a red, white and blue pattern below this"
+ RenderBlock (floating) {div} at (14,499) size 200x200 [border: (14px solid #FF0000)]
+ RenderBlock {div} at (28,28) size 144x144 [bgcolor=#0000FF]
+ RenderBlock {p} at (0,713) size 762x28
+ RenderText {#text} at (0,0) size 578x28
+ text run at (0,0) width 578: "There should be a red, white and blue pattern above this"
diff --git a/LayoutTests/platform/qt/svg/zoom/text/absolute-sized-document-no-scrollbars-expected.txt b/LayoutTests/platform/qt/svg/zoom/text/absolute-sized-document-no-scrollbars-expected.txt
new file mode 100644
index 0000000..bd1e15d
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/text/absolute-sized-document-no-scrollbars-expected.txt
@@ -0,0 +1,6 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 480x360
+ RenderSVGRoot {svg} at (0,0) size 480x360
+ RenderPath {rect} at (0,0) size 480x360 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00 L479.00,1.00 L479.00,359.00 L1.00,359.00 L1.00,1.00"]
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/svg/zoom/text/absolute-sized-document-scrollbars-expected.txt b/LayoutTests/platform/qt/svg/zoom/text/absolute-sized-document-scrollbars-expected.txt
new file mode 100644
index 0000000..bd1e15d
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/text/absolute-sized-document-scrollbars-expected.txt
@@ -0,0 +1,6 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 480x360
+ RenderSVGRoot {svg} at (0,0) size 480x360
+ RenderPath {rect} at (0,0) size 480x360 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00 L479.00,1.00 L479.00,359.00 L1.00,359.00 L1.00,1.00"]
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/svg/zoom/text/relative-sized-document-scrollbars-expected.txt b/LayoutTests/platform/qt/svg/zoom/text/relative-sized-document-scrollbars-expected.txt
new file mode 100644
index 0000000..30873aa
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/text/relative-sized-document-scrollbars-expected.txt
@@ -0,0 +1,6 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderSVGRoot {svg} at (0,0) size 800x600
+ RenderPath {rect} at (7,5) size 786x590 [stroke={[type=SOLID] [color=#000000]}] [data="M8.00,6.00 L792.00,6.00 L792.00,594.00 L8.00,594.00 L8.00,6.00"]
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/svg/zoom/text/zoom-foreignObject-expected.txt b/LayoutTests/platform/qt/svg/zoom/text/zoom-foreignObject-expected.txt
new file mode 100644
index 0000000..589f212
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/text/zoom-foreignObject-expected.txt
@@ -0,0 +1,15 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderSVGRoot {svg} at (0,0) size 800x600
+ RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderBlock {xhtml:div} at (0,0) size 580x20
+ RenderText {#text} at (0,0) size 89x20
+ text run at (0,0) width 89: "This is a test"
+ RenderBlock (anonymous) at (0,20) size 580x20
+ RenderInline {xhtml:a} at (0,0) size 73x20 [color=#0000EE]
+ RenderText {#text} at (0,0) size 73x20
+ text run at (0,0) width 73: "and a link."
+ RenderBR {xhtml:br} at (73,0) size 0x20
+ RenderPath {rect} at (9,9) size 582x382 [stroke={[type=SOLID] [color=#008000]}] [data="M10.00,10.00 L590.00,10.00 L590.00,390.00 L10.00,390.00 L10.00,10.00"]
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.txt b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
new file mode 100644
index 0000000..031119d
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
@@ -0,0 +1,19 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x488
+ RenderBlock {html} at (0,0) size 800x488
+ RenderBody {body} at (8,23) size 784x457
+ RenderBlock {p} at (0,0) size 784x28 [color=#000080]
+ RenderText {#text} at (0,0) size 634x28
+ text run at (0,0) width 634: "There should be a blue circle with the word \"TEST\" in it below."
+ RenderBlock (anonymous) at (0,51) size 784x406
+ RenderSVGRoot {svg} at (8,74) size 400x400
+ RenderPath {rect} at (8,74) size 400x400 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00 L400.00,0.00 L400.00,400.00 L0.00,400.00 L0.00,0.00"]
+ RenderPath {circle} at (8,74) size 400x400 [fill={[type=SOLID] [color=#000080]}] [data="M400.00,200.00 L399.61,212.56 L398.42,225.07 L396.46,237.48 L393.72,249.74 L390.21,261.80 L385.96,273.62 L380.97,285.16 L375.26,296.35 L368.87,307.17 L361.80,317.56 L354.10,327.48 L345.79,336.91 L336.91,345.79 L327.48,354.10 L317.56,361.80 L307.17,368.87 L296.35,375.26 L285.16,380.97 L273.62,385.96 L261.80,390.21 L249.74,393.72 L237.48,396.46 L225.07,398.42 L212.56,399.61 L200.00,400.00 L187.44,399.61 L174.93,398.42 L162.52,396.46 L150.26,393.72 L138.20,390.21 L126.38,385.96 L114.84,380.97 L103.65,375.26 L92.83,368.87 L82.44,361.80 L72.52,354.10 L63.09,345.79 L54.21,336.91 L45.90,327.48 L38.20,317.56 L31.13,307.17 L24.74,296.35 L19.03,285.16 L14.04,273.62 L9.79,261.80 L6.28,249.74 L3.54,237.48 L1.58,225.07 L0.39,212.56 L0.00,200.00 L0.39,187.44 L1.58,174.93 L3.54,162.52 L6.28,150.26 L9.79,138.20 L14.04,126.38 L19.03,114.84 L24.74,103.65 L31.13,92.83 L38.20,82.44 L45.90,72.52 L54.21,63.09 L63.09,54.21 L72.52,45.90 L82.44,38.20 L92.83,31.13 L103.65,24.74 L114.84,19.03 L126.38,14.04 L138.20,9.79 L150.26,6.28 L162.52,3.54 L174.93,1.58 L187.44,0.39 L200.00,0.00 L212.56,0.39 L225.07,1.58 L237.48,3.54 L249.74,6.28 L261.80,9.79 L273.62,14.04 L285.16,19.03 L296.35,24.74 L307.17,31.13 L317.56,38.20 L327.48,45.90 L336.91,54.21 L345.79,63.09 L354.10,72.52 L361.80,82.44 L368.87,92.83 L375.26,103.65 L380.97,114.84 L385.96,126.38 L390.21,138.20 L393.72,150.26 L396.46,162.52 L398.42,174.93 L399.61,187.44 L400.00,200.00"]
+ RenderForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
+ RenderBlock {div} at (0,0) size 400x62
+ RenderText {#text} at (136,0) size 128x62
+ text run at (136,0) width 128: "TEST"
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.txt b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.txt
new file mode 100644
index 0000000..2139e5a
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.txt
@@ -0,0 +1,19 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x363
+ RenderBlock {html} at (0,0) size 800x314
+ RenderBody {body} at (8,10) size 784x294
+ RenderBlock {p} at (0,0) size 784x28 [color=#000080]
+ RenderText {#text} at (0,0) size 730x28
+ text run at (0,0) width 730: "The word \"TEST \" should appear twice below, the same size each time."
+ RenderBlock (anonymous) at (0,38) size 784x126
+ RenderSVGRoot {svg} at (8,48) size 400x120
+ RenderPath {rect} at (8,48) size 400x120 [transform={m=((10.00,0.00)(0.00,10.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#EEEEEE]}] [data="M0.00,0.00 L60.00,0.00 L60.00,12.00 L0.00,12.00 L0.00,0.00"]
+ RenderForeignObject {foreignObject} at (0,0) size 60x10
+ RenderBlock {div} at (0,0) size 60x12 [color=#000080]
+ RenderText {#text} at (0,0) size 27x12
+ text run at (0,0) width 27: "TEST"
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {div} at (0,174) size 400x120 [color=#000080] [bgcolor=#EEEEEE]
+ RenderText {#text} at (0,0) size 368x179
+ text run at (0,0) width 368: "TEST"
diff --git a/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.txt b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.txt
new file mode 100644
index 0000000..f23c86f
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.txt
@@ -0,0 +1,16 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x339
+ RenderBlock {html} at (0,0) size 800x339
+ RenderBody {body} at (8,23) size 784x308
+ RenderBlock {p} at (0,0) size 784x56 [color=#000080]
+ RenderText {#text} at (0,0) size 732x56
+ text run at (0,0) width 732: "Zoom in and out. The following two squares should always be the same"
+ text run at (0,28) width 48: "size."
+ RenderBlock {div} at (0,79) size 100x100 [bgcolor=#000080]
+ RenderBlock (anonymous) at (0,202) size 784x106
+ RenderSVGRoot {svg} at (8,225) size 100x100
+ RenderPath {rect} at (8,225) size 100x100 [fill={[type=SOLID] [color=#000080]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 L0.00,0.00"]
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.txt b/LayoutTests/platform/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.txt
new file mode 100644
index 0000000..5554f14
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.txt
@@ -0,0 +1,27 @@
+layer at (0,0) size 784x636
+ RenderView at (0,0) size 784x600
+layer at (0,0) size 784x636
+ RenderBlock {html} at (0,0) size 784x636
+ RenderBody {body} at (8,8) size 768x605
+ RenderBlock (anonymous) at (0,0) size 768x56
+ RenderText {#text} at (0,0) size 758x56
+ text run at (0,0) width 382: "The two blocks should look identical. "
+ text run at (382,0) width 376: "One uses an SVG, and the other just"
+ text run at (0,28) width 257: "uses a normal HTML div."
+ RenderBlock {p} at (0,79) size 768x28
+ RenderText {#text} at (0,0) size 575x28
+ text run at (0,0) width 575: "There should be a red, white and blue pattern below this"
+ RenderSVGRoot {svg} at (38,168) size 120x120
+ RenderPath {rect} at (38,168) size 100x100 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 L0.00,0.00"]
+ RenderBlock {p} at (0,290) size 768x28
+ RenderText {#text} at (0,0) size 578x28
+ text run at (0,0) width 578: "There should be a red, white and blue pattern above this"
+ RenderBlock {hr} at (0,341) size 768x2 [border: (1px inset #000000)]
+ RenderBlock {p} at (0,366) size 768x28
+ RenderText {#text} at (0,0) size 575x28
+ text run at (0,0) width 575: "There should be a red, white and blue pattern below this"
+ RenderBlock (floating) {div} at (10,427) size 140x140 [border: (10px solid #FF0000)]
+ RenderBlock {div} at (20,20) size 100x100 [bgcolor=#0000FF]
+ RenderBlock {p} at (0,577) size 768x28
+ RenderText {#text} at (0,0) size 578x28
+ text run at (0,0) width 578: "There should be a red, white and blue pattern above this"
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index cfa1557..70d8bad 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-19 Andras Becsi <abecsi at webkit.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Implement textZoomIn() and textZoomOut() in DRT's EventSender, add results
+ for passing new tests and unskip the passing ones from the Skipped list.
+ https://bugs.webkit.org/show_bug.cgi?id=35159
+
+ * DumpRenderTree/qt/EventSenderQt.cpp:
+ (EventSender::textZoomIn):
+ (EventSender::textZoomOut):
+ * DumpRenderTree/qt/EventSenderQt.h:
+
2010-02-19 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Eric Seidel.
diff --git a/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp b/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
index 5603da6..1ef2d3f 100644
--- a/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
@@ -399,18 +399,28 @@ void EventSender::sendTouchEvent(QEvent::Type type)
void EventSender::zoomPageIn()
{
- QWebFrame* frame = m_page->mainFrame();
- if (frame)
+ if (QWebFrame* frame = m_page->mainFrame())
frame->setZoomFactor(frame->zoomFactor() * ZOOM_STEP);
}
void EventSender::zoomPageOut()
{
- QWebFrame* frame = m_page->mainFrame();
- if (frame)
+ if (QWebFrame* frame = m_page->mainFrame())
frame->setZoomFactor(frame->zoomFactor() / ZOOM_STEP);
}
+void EventSender::textZoomIn()
+{
+ if (QWebFrame* frame = m_page->mainFrame())
+ frame->setTextSizeMultiplier(frame->textSizeMultiplier() * ZOOM_STEP);
+}
+
+void EventSender::textZoomOut()
+{
+ if (QWebFrame* frame = m_page->mainFrame())
+ frame->setTextSizeMultiplier(frame->textSizeMultiplier() / ZOOM_STEP);
+}
+
QWebFrame* EventSender::frameUnderMouse() const
{
QWebFrame* frame = m_page->mainFrame();
diff --git a/WebKitTools/DumpRenderTree/qt/EventSenderQt.h b/WebKitTools/DumpRenderTree/qt/EventSenderQt.h
index f6cfc7c..38bca89 100644
--- a/WebKitTools/DumpRenderTree/qt/EventSenderQt.h
+++ b/WebKitTools/DumpRenderTree/qt/EventSenderQt.h
@@ -68,6 +68,8 @@ public slots:
void touchEnd();
void zoomPageIn();
void zoomPageOut();
+ void textZoomIn();
+ void textZoomOut();
void clearTouchPoints();
void releaseTouchPoint(int index);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list