[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8
kenneth at webkit.org
kenneth at webkit.org
Wed Feb 10 22:17:09 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit b60bcaa30f7b6b82ee448db1650c9a199fec4e8a
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 5 21:21:10 2010 +0000
Unreviewed, missed in earlier commit.
Add expected frame flattening results for Qt.
* platform/qt/fast/frames/flattening/frameset-flattening-advanced-expected.txt: Added.
* platform/qt/fast/frames/flattening/frameset-flattening-grid-expected.txt: Added.
* platform/qt/fast/frames/flattening/frameset-flattening-simple-expected.txt: Added.
* platform/qt/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt: Added.
* platform/qt/fast/frames/flattening/frameset-flattening-subframesets-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54441 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2b0f9ef..d2f542a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-05 Kenneth Rohde Christiansen <kenneth at webkit.org>
+
+ Unreviewed, missed in earlier commit.
+
+ Add expected frame flattening results for Qt.
+
+ * platform/qt/fast/frames/flattening/frameset-flattening-advanced-expected.txt: Added.
+ * platform/qt/fast/frames/flattening/frameset-flattening-grid-expected.txt: Added.
+ * platform/qt/fast/frames/flattening/frameset-flattening-simple-expected.txt: Added.
+ * platform/qt/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt: Added.
+ * platform/qt/fast/frames/flattening/frameset-flattening-subframesets-expected.txt: Added.
+
2010-01-19 Kenneth Rohde Christiansen <kenneth at webkit.org>
Reviewed by Dave Hyatt.
diff --git a/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-advanced-expected.txt b/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-advanced-expected.txt
new file mode 100644
index 0000000..db96f36
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-advanced-expected.txt
@@ -0,0 +1,43 @@
+layer at (0,0) size 865x607
+ RenderView at (0,0) size 784x584
+layer at (0,0) size 865x607
+ RenderBlock {HTML} at (0,0) size 784x607
+ RenderFrameSet {FRAMESET} at (0,0) size 865x607
+ RenderFrameSet {FRAMESET} at (0,0) size 865x207
+ RenderFrame {FRAME} at (0,0) size 350x207
+ layer at (0,0) size 350x207
+ RenderView at (0,0) size 350x207
+ layer at (0,0) size 350x207
+ RenderBlock {HTML} at (0,0) size 350x207
+ RenderBody {BODY} at (8,8) size 334x183 [bgcolor=#008000]
+ RenderBlock {P} at (0,0) size 334x40
+ RenderText {#text} at (0,0) size 327x40
+ text run at (0,0) width 327: "Test for frameset flattening. The flattening only"
+ text run at (0,20) width 157: "works inside the DRT."
+ layer at (0,0) size 350x50
+ RenderBlock (positioned) {DIV} at (0,0) size 350x50
+ RenderFrame {FRAME} at (356,0) size 509x207
+ layer at (0,0) size 509x207
+ RenderView at (0,0) size 509x207
+ layer at (0,0) size 509x207
+ RenderBlock {HTML} at (0,0) size 509x207
+ RenderBody {BODY} at (8,8) size 493x191 [bgcolor=#FF0000]
+ layer at (0,0) size 300x100
+ RenderBlock (positioned) {DIV} at (0,0) size 300x100
+ RenderFrameSet {FRAMESET} at (0,207) size 865x400
+ RenderFrame {FRAME} at (0,0) size 200x400
+ layer at (0,0) size 200x400
+ RenderView at (0,0) size 200x400
+ layer at (0,0) size 200x400
+ RenderBlock {HTML} at (0,0) size 200x400
+ RenderBody {BODY} at (8,8) size 184x384 [bgcolor=#FFFF00]
+ layer at (0,0) size 50x200
+ RenderBlock (positioned) {DIV} at (0,0) size 50x200
+ RenderFrame {FRAME} at (206,0) size 659x400
+ layer at (0,0) size 659x400
+ RenderView at (0,0) size 659x400
+ layer at (0,0) size 659x400
+ RenderBlock {HTML} at (0,0) size 659x400
+ RenderBody {BODY} at (8,8) size 643x384 [bgcolor=#0000FF]
+ layer at (0,0) size 650x400
+ RenderBlock (positioned) {DIV} at (0,0) size 650x400
diff --git a/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-grid-expected.txt b/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-grid-expected.txt
new file mode 100644
index 0000000..9997e1a
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-grid-expected.txt
@@ -0,0 +1,57 @@
+CONSOLE MESSAGE: line 2: ReferenceError: Can't find variable: test
+layer at (0,0) size 1200x800
+ RenderView at (0,0) size 784x584
+layer at (0,0) size 1200x800
+ RenderBlock {HTML} at (0,0) size 784x800
+ RenderFrameSet {FRAMESET} at (0,0) size 1200x800
+ RenderFrame {FRAME} at (0,0) size 600x200
+ layer at (0,0) size 600x200
+ RenderView at (0,0) size 600x200
+ layer at (0,0) size 600x200
+ RenderBlock {HTML} at (0,0) size 600x200
+ RenderBody {BODY} at (8,8) size 584x176 [bgcolor=#008000]
+ RenderBlock {P} at (0,0) size 584x20
+ RenderText {#text} at (0,0) size 487x20
+ text run at (0,0) width 487: "Test for frameset flattening. The flattening only works inside the DRT."
+ RenderBlock {P} at (0,36) size 584x40
+ RenderText {#text} at (0,0) size 508x40
+ text run at (0,0) width 508: "This frame should be 300px wide, 200px tall and not be scrollable (have"
+ text run at (0,20) width 78: "scrollbars)."
+ layer at (0,0) size 300x200
+ RenderBlock (positioned) {DIV} at (0,0) size 300x200
+ RenderFrame {FRAME} at (600,0) size 600x200
+ layer at (0,0) size 600x200
+ RenderView at (0,0) size 600x200
+ layer at (0,0) size 600x200
+ RenderBlock {HTML} at (0,0) size 600x200
+ RenderBody {BODY} at (8,8) size 584x176 [bgcolor=#FF0000]
+ RenderBlock {P} at (0,0) size 584x40
+ RenderText {#text} at (0,0) size 508x40
+ text run at (0,0) width 508: "This frame should be 300px wide, 200px tall and not be scrollable (have"
+ text run at (0,20) width 78: "scrollbars)."
+ layer at (0,0) size 300x50
+ RenderBlock (positioned) {DIV} at (0,0) size 300x50
+ RenderFrame {FRAME} at (0,200) size 600x600
+ layer at (0,0) size 600x600
+ RenderView at (0,0) size 600x600
+ layer at (0,0) size 600x600
+ RenderBlock {HTML} at (0,0) size 600x600
+ RenderBody {BODY} at (8,8) size 584x576 [bgcolor=#FFFF00]
+ RenderBlock {P} at (0,0) size 584x40
+ RenderText {#text} at (0,0) size 508x40
+ text run at (0,0) width 508: "This frame should be 600px wide, 600px tall and not be scrollable (have"
+ text run at (0,20) width 78: "scrollbars)."
+ layer at (0,0) size 600x600
+ RenderBlock (positioned) {DIV} at (0,0) size 600x600
+ RenderFrame {FRAME} at (600,200) size 600x600
+ layer at (0,0) size 600x600
+ RenderView at (0,0) size 600x600
+ layer at (0,0) size 600x600
+ RenderBlock {HTML} at (0,0) size 600x600
+ RenderBody {BODY} at (8,8) size 584x576 [bgcolor=#0000FF]
+ RenderBlock {P} at (0,0) size 584x40
+ RenderText {#text} at (0,0) size 508x40
+ text run at (0,0) width 508: "This frame should be 600px wide, 600px tall and not be scrollable (have"
+ text run at (0,20) width 78: "scrollbars)."
+ layer at (0,0) size 600x600
+ RenderBlock (positioned) {DIV} at (0,0) size 600x600
diff --git a/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-simple-expected.txt b/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-simple-expected.txt
new file mode 100644
index 0000000..1240fee
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-simple-expected.txt
@@ -0,0 +1,25 @@
+layer at (0,0) size 1000x600
+ RenderView at (0,0) size 800x584
+layer at (0,0) size 1000x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderFrameSet {FRAMESET} at (0,0) size 1000x600
+ RenderFrame {FRAME} at (0,0) size 800x600
+ 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 [bgcolor=#008000]
+ RenderBlock {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 487x20
+ text run at (0,0) width 487: "Test for frameset flattening. The flattening only works inside the DRT."
+ RenderBlock {P} at (0,36) size 784x20
+ RenderText {#text} at (0,0) size 513x20
+ text run at (0,0) width 513: "This frame should be 800px wide and not be scrollable (have scrollbars)."
+ layer at (0,100) size 800x1
+ RenderBlock (positioned) {DIV} at (0,100) size 800x1
+ RenderFrame {FRAME} at (800,0) size 200x600
+ layer at (0,0) size 200x600
+ RenderView at (0,0) size 200x600
+ layer at (0,0) size 200x600
+ RenderBlock {HTML} at (0,0) size 200x600
+ RenderBody {BODY} at (8,8) size 184x584
diff --git a/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt b/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt
new file mode 100644
index 0000000..1ae10da
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt
@@ -0,0 +1,27 @@
+layer at (0,0) size 1000x650
+ RenderView at (0,0) size 784x584
+layer at (0,0) size 1000x650
+ RenderBlock {HTML} at (0,0) size 784x650
+ RenderFrameSet {FRAMESET} at (0,0) size 1000x650
+ RenderFrame {FRAME} at (0,0) size 300x650
+ layer at (0,0) size 300x650
+ RenderView at (0,0) size 300x650
+ layer at (0,0) size 300x650
+ RenderBlock {HTML} at (0,0) size 300x650
+ RenderBody {BODY} at (8,8) size 284x626 [bgcolor=#008000]
+ RenderBlock {P} at (0,0) size 284x40
+ RenderText {#text} at (0,0) size 260x40
+ text run at (0,0) width 223: "Test for frameset flattening. The"
+ text run at (0,20) width 260: "flattening only works inside the DRT."
+ RenderBlock {P} at (0,56) size 284x40
+ RenderText {#text} at (0,0) size 266x40
+ text run at (0,0) width 266: "This frame should be 300px wide and"
+ text run at (0,20) width 243: "not be scrollable (have scrollbars)."
+ layer at (0,350) size 300x300
+ RenderBlock (positioned) {DIV} at (0,350) size 300x300 [bgcolor=#0000FF]
+ RenderFrame {FRAME} at (300,0) size 700x650
+ layer at (0,0) size 700x650
+ RenderView at (0,0) size 700x650
+ layer at (0,0) size 700x650
+ RenderBlock {HTML} at (0,0) size 700x650
+ RenderBody {BODY} at (8,8) size 684x634
diff --git a/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-subframesets-expected.txt b/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-subframesets-expected.txt
new file mode 100644
index 0000000..f80eb2d
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-subframesets-expected.txt
@@ -0,0 +1,58 @@
+layer at (0,0) size 900x630
+ RenderView at (0,0) size 784x584
+layer at (0,0) size 900x630
+ RenderBlock {HTML} at (0,0) size 784x630
+ RenderFrameSet {FRAMESET} at (0,0) size 900x630
+ RenderFrameSet {FRAMESET} at (0,0) size 900x150
+ RenderFrame {FRAME} at (0,0) size 450x150
+ layer at (0,0) size 450x150
+ RenderView at (0,0) size 450x150
+ layer at (0,0) size 450x150
+ RenderBlock {HTML} at (0,0) size 450x150
+ RenderBody {BODY} at (8,8) size 434x126 [bgcolor=#008000]
+ RenderBlock {P} at (0,0) size 434x20
+ RenderText {#text} at (0,0) size 399x20
+ text run at (0,0) width 399: "A frameset flattening test that only works inside the DRT."
+ RenderBlock {P} at (0,36) size 434x40
+ RenderText {#text} at (0,0) size 425x40
+ text run at (0,0) width 425: "This frame is inside frameset 1 and should be at least 450px"
+ text run at (0,20) width 267: "wide, 150px tall and not be scrollable."
+ layer at (0,0) size 450x50
+ RenderBlock (positioned) {DIV} at (0,0) size 450x50
+ RenderFrame {FRAME} at (450,0) size 450x150
+ layer at (0,0) size 450x150
+ RenderView at (0,0) size 450x150
+ layer at (0,0) size 450x150
+ RenderBlock {HTML} at (0,0) size 450x150
+ RenderBody {BODY} at (8,8) size 434x126 [bgcolor=#FF0000]
+ RenderBlock {P} at (0,0) size 434x40
+ RenderText {#text} at (0,0) size 425x40
+ text run at (0,0) width 425: "This frame is inside frameset 1 and should be at least 450px"
+ text run at (0,20) width 267: "wide, 150px tall and not be scrollable."
+ layer at (0,0) size 450x150
+ RenderBlock (positioned) {DIV} at (0,0) size 450x150
+ RenderFrameSet {FRAMESET} at (0,150) size 900x480
+ RenderFrame {FRAME} at (0,0) size 450x480
+ layer at (0,0) size 450x480
+ RenderView at (0,0) size 450x480
+ layer at (0,0) size 450x480
+ RenderBlock {HTML} at (0,0) size 450x480
+ RenderBody {BODY} at (8,8) size 434x456 [bgcolor=#FFFF00]
+ RenderBlock {P} at (0,0) size 434x40
+ RenderText {#text} at (0,0) size 425x40
+ text run at (0,0) width 425: "This frame is inside frameset 2 and should be at least 450px"
+ text run at (0,20) width 267: "wide, 400px tall and not be scrollable."
+ layer at (0,0) size 200x450
+ RenderBlock (positioned) {DIV} at (0,0) size 200x450
+ RenderFrame {FRAME} at (450,0) size 450x480
+ layer at (0,0) size 450x480
+ RenderView at (0,0) size 450x480
+ layer at (0,0) size 450x480
+ RenderBlock {HTML} at (0,0) size 450x480
+ RenderBody {BODY} at (8,8) size 434x456 [bgcolor=#0000FF]
+ RenderBlock {P} at (0,0) size 434x40
+ RenderText {#text} at (0,0) size 425x40
+ text run at (0,0) width 425: "This frame is inside frameset 2 and should be at least 450px"
+ text run at (0,20) width 267: "wide, 400px tall and not be scrollable."
+ layer at (0,0) size 450x450
+ RenderBlock (positioned) {DIV} at (0,0) size 450x450
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list