[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
tonikitoo at webkit.org
tonikitoo at webkit.org
Wed Dec 22 14:42:02 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4d2b96e5b7ce3b9b98c6e09392c884b74798b96c
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Oct 17 04:47:14 2010 +0000
2010-10-16 Antonio Gomes <agomes at rim.com>
Complementary to r69919.
Unreviewed expectation update for frame flattening tests from the Gtk+ bots.
Basically 3px difference between the results generated on my machine and the ones
from the Gtk+ bots.
* platform/gtk/fast/frames/flattening/frameset-flattening-advanced-expected.txt: Added.
* platform/gtk/fast/frames/flattening/frameset-flattening-grid-expected.txt:
* platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.txt:
* platform/gtk/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt:
* platform/gtk/fast/frames/flattening/frameset-flattening-subframesets-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69921 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-advanced-expected.txt b/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-advanced-expected.txt
new file mode 100644
index 0000000..4a250ad
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-advanced-expected.txt
@@ -0,0 +1,43 @@
+layer at (0,0) size 863x600
+ RenderView at (0,0) size 781x581
+layer at (0,0) size 863x600
+ RenderBlock {HTML} at (0,0) size 781x600
+ RenderFrameSet {FRAMESET} at (0,0) size 863x600
+ RenderFrameSet {FRAMESET} at (0,0) size 863x200
+ RenderFrame {FRAME} at (0,0) size 350x200
+ layer at (0,0) size 350x200
+ RenderView at (0,0) size 350x200
+ layer at (0,0) size 350x200
+ RenderBlock {HTML} at (0,0) size 350x200
+ RenderBody {BODY} at (8,8) size 334x176 [bgcolor=#008000]
+ RenderBlock {P} at (0,0) size 334x38
+ RenderText {#text} at (0,0) size 318x38
+ text run at (0,0) width 318: "Test for frameset flattening. The flattening only works"
+ text run at (0,19) width 94: "inside the DRT."
+ layer at (0,0) size 350x50
+ RenderBlock (positioned) {DIV} at (0,0) size 350x50
+ RenderFrame {FRAME} at (356,0) size 507x200
+ layer at (0,0) size 507x200
+ RenderView at (0,0) size 507x200
+ layer at (0,0) size 507x200
+ RenderBlock {HTML} at (0,0) size 507x200
+ RenderBody {BODY} at (8,8) size 491x184 [bgcolor=#FF0000]
+ layer at (0,0) size 300x100
+ RenderBlock (positioned) {DIV} at (0,0) size 300x100
+ RenderFrameSet {FRAMESET} at (0,200) size 863x400
+ 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 657x400
+ layer at (0,0) size 657x400
+ RenderView at (0,0) size 657x400
+ layer at (0,0) size 657x400
+ RenderBlock {HTML} at (0,0) size 657x400
+ RenderBody {BODY} at (8,8) size 641x384 [bgcolor=#0000FF]
+ layer at (0,0) size 650x400
+ RenderBlock (positioned) {DIV} at (0,0) size 650x400
diff --git a/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-grid-expected.txt b/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-grid-expected.txt
index 424027e..0538362 100644
--- a/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-grid-expected.txt
+++ b/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-grid-expected.txt
@@ -1,7 +1,7 @@
layer at (0,0) size 1200x800
- RenderView at (0,0) size 784x584
+ RenderView at (0,0) size 781x581
layer at (0,0) size 1200x800
- RenderBlock {HTML} at (0,0) size 784x800
+ RenderBlock {HTML} at (0,0) size 781x800
RenderFrameSet {FRAMESET} at (0,0) size 1200x800
RenderFrame {FRAME} at (0,0) size 600x200
layer at (0,0) size 600x200
diff --git a/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.txt b/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.txt
index 2f57498..ff6d2dd 100644
--- a/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.txt
+++ b/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.txt
@@ -1,14 +1,14 @@
-layer at (0,0) size 1000x584
- RenderView at (0,0) size 800x584
-layer at (0,0) size 1000x584
- RenderBlock {HTML} at (0,0) size 800x584
- RenderFrameSet {FRAMESET} at (0,0) size 1000x584
- RenderFrame {FRAME} at (0,0) size 800x584
- layer at (0,0) size 800x584
- RenderView at (0,0) size 800x584
- layer at (0,0) size 800x584
- RenderBlock {HTML} at (0,0) size 800x584
- RenderBody {BODY} at (8,8) size 784x560 [bgcolor=#008000]
+layer at (0,0) size 1000x581
+ RenderView at (0,0) size 800x581
+layer at (0,0) size 1000x581
+ RenderBlock {HTML} at (0,0) size 800x581
+ RenderFrameSet {FRAMESET} at (0,0) size 1000x581
+ RenderFrame {FRAME} at (0,0) size 800x581
+ layer at (0,0) size 800x581
+ RenderView at (0,0) size 800x581
+ layer at (0,0) size 800x581
+ RenderBlock {HTML} at (0,0) size 800x581
+ RenderBody {BODY} at (8,8) size 784x557 [bgcolor=#008000]
RenderBlock {P} at (0,0) size 784x19
RenderText {#text} at (0,0) size 416x19
text run at (0,0) width 416: "Test for frameset flattening. The flattening only works inside the DRT."
@@ -17,9 +17,9 @@ layer at (0,0) size 1000x584
text run at (0,0) width 438: "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 200x584
- layer at (0,0) size 200x584
- RenderView at (0,0) size 200x584
- layer at (0,0) size 200x584
- RenderBlock {HTML} at (0,0) size 200x584
- RenderBody {BODY} at (8,8) size 184x568
+ RenderFrame {FRAME} at (800,0) size 200x581
+ layer at (0,0) size 200x581
+ RenderView at (0,0) size 200x581
+ layer at (0,0) size 200x581
+ RenderBlock {HTML} at (0,0) size 200x581
+ RenderBody {BODY} at (8,8) size 184x565
diff --git a/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt b/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt
index 45f77fc..06138d0 100644
--- a/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt
+++ b/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt
@@ -1,7 +1,7 @@
layer at (0,0) size 1000x650
- RenderView at (0,0) size 784x584
+ RenderView at (0,0) size 781x581
layer at (0,0) size 1000x650
- RenderBlock {HTML} at (0,0) size 784x650
+ RenderBlock {HTML} at (0,0) size 781x650
RenderFrameSet {FRAMESET} at (0,0) size 1000x650
RenderFrame {FRAME} at (0,0) size 300x650
layer at (0,0) size 300x650
diff --git a/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-subframesets-expected.txt b/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-subframesets-expected.txt
index bffe9fe..0bdfd69 100644
--- a/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-subframesets-expected.txt
+++ b/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-subframesets-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 900x618
- RenderView at (0,0) size 784x584
-layer at (0,0) size 900x618
- RenderBlock {HTML} at (0,0) size 784x618
- RenderFrameSet {FRAMESET} at (0,0) size 900x618
+layer at (0,0) size 900x615
+ RenderView at (0,0) size 781x581
+layer at (0,0) size 900x615
+ RenderBlock {HTML} at (0,0) size 781x615
+ RenderFrameSet {FRAMESET} at (0,0) size 900x615
RenderFrameSet {FRAMESET} at (0,0) size 900x150
RenderFrame {FRAME} at (0,0) size 450x150
layer at (0,0) size 450x150
@@ -31,25 +31,25 @@ layer at (0,0) size 900x618
text run at (0,19) width 193: "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 900x468
- RenderFrame {FRAME} at (0,0) size 450x468
- layer at (0,0) size 450x468
- RenderView at (0,0) size 450x468
- layer at (0,0) size 450x468
- RenderBlock {HTML} at (0,0) size 450x468
- RenderBody {BODY} at (8,8) size 434x444 [bgcolor=#FFFF00]
+ RenderFrameSet {FRAMESET} at (0,150) size 900x465
+ RenderFrame {FRAME} at (0,0) size 450x465
+ layer at (0,0) size 450x465
+ RenderView at (0,0) size 450x465
+ layer at (0,0) size 450x465
+ RenderBlock {HTML} at (0,0) size 450x465
+ RenderBody {BODY} at (8,8) size 434x441 [bgcolor=#FFFF00]
RenderBlock {P} at (0,0) size 434x38
RenderText {#text} at (0,0) size 395x38
text run at (0,0) width 395: "This frame is inside frameset 2 and should be at least 450px wide,"
text run at (0,19) width 193: "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 450x468
- layer at (0,0) size 450x468
- RenderView at (0,0) size 450x468
- layer at (0,0) size 450x468
- RenderBlock {HTML} at (0,0) size 450x468
- RenderBody {BODY} at (8,8) size 434x444 [bgcolor=#0000FF]
+ RenderFrame {FRAME} at (450,0) size 450x465
+ layer at (0,0) size 450x465
+ RenderView at (0,0) size 450x465
+ layer at (0,0) size 450x465
+ RenderBlock {HTML} at (0,0) size 450x465
+ RenderBody {BODY} at (8,8) size 434x441 [bgcolor=#0000FF]
RenderBlock {P} at (0,0) size 434x38
RenderText {#text} at (0,0) size 395x38
text run at (0,0) width 395: "This frame is inside frameset 2 and should be at least 450px wide,"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list