Skip to content

Instantly share code, notes, and snippets.

@Smith1123

Smith1123/gist:1242596

Created September 26, 2011 16:07
Show Gist options
  • Save Smith1123/1242596 to your computer and use it in GitHub Desktop.
Save Smith1123/1242596 to your computer and use it in GitHub Desktop.
Download ZIP
gardening
Raw
gistfile1.diff
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d8c288b..f62293a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,12 @@
2011-09-26 Zsolt Fehér <feherzs@inf.u-szeged.hu>
+ Unreviewed gardening, update expected files after r95896.
+
+ * platform/qt/fast/frames/flattening/frameset-flattening-advanced-expected.txt:
+ * platform/qt/fast/frames/flattening/frameset-flattening-subframesets-expected.txt:
+
+2011-09-26 Zsolt Fehér <feherzs@inf.u-szeged.hu>
+
Unreviewed Qt gardening.
https://bugs.webkit.org/show_bug.cgi?id=68796
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
index d8cb08f..3ec7951 100644
--- a/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-advanced-expected.txt
+++ b/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-advanced-expected.txt
@@ -1,30 +1,30 @@
-layer at (0,0) size 865x607
+layer at (0,0) size 865x602
RenderView at (0,0) size 784x584
-layer at (0,0) size 784x607
- 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]
+layer at (0,0) size 784x602
+ RenderBlock {HTML} at (0,0) size 784x602
+ RenderFrameSet {FRAMESET} at (0,0) size 865x602
+ RenderFrameSet {FRAMESET} at (0,0) size 865x202
+ RenderFrame {FRAME} at (0,0) size 350x202
+ layer at (0,0) size 350x202
+ RenderView at (0,0) size 350x202
+ layer at (0,0) size 350x202
+ RenderBlock {HTML} at (0,0) size 350x202
+ RenderBody {BODY} at (8,8) size 334x178 [bgcolor=#008000]
RenderBlock {P} at (0,0) size 334x44
RenderText {#text} at (0,0) size 319x44
text run at (0,0) width 319: "Test for frameset flattening. The flattening only"
text run at (0,22) width 153: "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]
+ RenderFrame {FRAME} at (356,0) size 509x202
+ layer at (0,0) size 509x202
+ RenderView at (0,0) size 509x202
+ layer at (0,0) size 509x202
+ RenderBlock {HTML} at (0,0) size 509x202
+ RenderBody {BODY} at (8,8) size 493x186 [bgcolor=#FF0000]
layer at (0,0) size 300x100
RenderBlock (positioned) {DIV} at (0,0) size 300x100
- RenderFrameSet {FRAMESET} at (0,207) size 865x400
+ RenderFrameSet {FRAMESET} at (0,202) size 865x400
RenderFrame {FRAME} at (0,0) size 200x400
layer at (0,0) size 200x400
RenderView at (0,0) size 200x400
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
index 20ce5a2..ccbf3b1 100644
--- a/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-subframesets-expected.txt
+++ b/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-subframesets-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 900x630
+layer at (0,0) size 900x618
RenderView at (0,0) size 784x584
-layer at (0,0) size 784x630
- RenderBlock {HTML} at (0,0) size 784x630
- RenderFrameSet {FRAMESET} at (0,0) size 900x630
+layer at (0,0) size 784x618
+ RenderBlock {HTML} at (0,0) size 784x618
+ RenderFrameSet {FRAMESET} at (0,0) size 900x618
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 784x630
text run at (0,22) width 254: "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]
+ 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]
RenderBlock {P} at (0,0) size 434x44
RenderText {#text} at (0,0) size 400x44
text run at (0,0) width 400: "This frame is inside frameset 2 and should be at least 450px"
text run at (0,22) width 254: "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]
+ 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]
RenderBlock {P} at (0,0) size 434x44
RenderText {#text} at (0,0) size 400x44
text run at (0,0) width 400: "This frame is inside frameset 2 and should be at least 450px"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment