From 3b9082b94ec3d881d27a656d17049cd1199c0dd2 Mon Sep 17 00:00:00 2001 From: "philn@webkit.org" Date: Tue, 27 Sep 2011 08:08:27 +0000 Subject: [PATCH] Unreviewed, GTK rebaseline after r95845, r95897 and r95857. * platform/gtk/fast/frames/flattening/frameset-flattening-advanced-expected.txt: * platform/gtk/fast/frames/flattening/frameset-flattening-subframesets-expected.txt: * platform/gtk/fast/ruby/ruby-text-before-after-content-expected.txt: Added. * platform/gtk/http/tests/security/cross-origin-xsl-BLOCKED-expected.txt: * platform/gtk/http/tests/security/cross-origin-xsl-redirect-BLOCKED-expected.txt: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96080 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 10 ++++++ .../frameset-flattening-advanced-expected.txt | 36 +++++++++++----------- .../frameset-flattening-subframesets-expected.txt | 34 ++++++++++---------- .../ruby-text-before-after-content-expected.txt | 25 +++++++++++++++ .../security/cross-origin-xsl-BLOCKED-expected.txt | 1 + .../cross-origin-xsl-redirect-BLOCKED-expected.txt | 1 + 6 files changed, 72 insertions(+), 35 deletions(-) create mode 100644 LayoutTests/platform/gtk/fast/ruby/ruby-text-before-after-content-expected.txt diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 271e04e..6a41808 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,13 @@ +2011-09-27 Philippe Normand + + Unreviewed, GTK rebaseline after r95845, r95897 and r95857. + + * platform/gtk/fast/frames/flattening/frameset-flattening-advanced-expected.txt: + * platform/gtk/fast/frames/flattening/frameset-flattening-subframesets-expected.txt: + * platform/gtk/fast/ruby/ruby-text-before-after-content-expected.txt: Added. + * platform/gtk/http/tests/security/cross-origin-xsl-BLOCKED-expected.txt: + * platform/gtk/http/tests/security/cross-origin-xsl-redirect-BLOCKED-expected.txt: + 2011-09-27 Rakesh KN with autofocus doesn't lose focus when it has a certain onblur listener 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 index 580e5ac..f3f2477 100644 --- a/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-advanced-expected.txt +++ b/LayoutTests/platform/gtk/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 334x38 RenderText {#text} at (0,0) size 297x38 text run at (0,0) width 297: "Test for frameset flattening. The flattening only" text run at (0,19) width 144: "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/gtk/fast/frames/flattening/frameset-flattening-subframesets-expected.txt b/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-subframesets-expected.txt index 38fcc9e..d5386c8 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 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,19) width 201: "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 434x38 RenderText {#text} at (0,0) size 414x38 text run at (0,0) width 414: "This frame is inside frameset 2 and should be at least 450px wide," text run at (0,19) width 201: "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 434x38 RenderText {#text} at (0,0) size 414x38 text run at (0,0) width 414: "This frame is inside frameset 2 and should be at least 450px wide," diff --git a/LayoutTests/platform/gtk/fast/ruby/ruby-text-before-after-content-expected.txt b/LayoutTests/platform/gtk/fast/ruby/ruby-text-before-after-content-expected.txt new file mode 100644 index 0000000..968c333 --- /dev/null +++ b/LayoutTests/platform/gtk/fast/ruby/ruby-text-before-after-content-expected.txt @@ -0,0 +1,25 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x88 + RenderBlock {HTML} at (0,0) size 800x88 + RenderBody {BODY} at (16,16) size 768x56 [color=#0000FF] + RenderRuby (inline) {RUBY} at (0,0) size 213x36 + RenderRubyRun (anonymous) at (0,19) size 192x37 + RenderRubyText {RT} at (0,-19) size 192x19 + RenderInline (generated) at (0,0) size 63x19 + RenderText at (0,0) size 63x19 + text run at (0,0) width 63: "BEFORE" + RenderText {#text} at (63,0) size 77x19 + text run at (63,0) width 77: "CONTENT" + RenderInline (generated) at (0,0) size 52x19 + RenderText at (140,0) size 52x19 + text run at (140,0) width 52: "AFTER" + RenderRubyBase (anonymous) at (0,0) size 192x37 + RenderText {#text} at (84,0) size 24x36 + text run at (84,0) width 24: "A" + RenderRubyRun (anonymous) at (192,19) size 21x37 + RenderRubyBase (anonymous) at (0,0) size 21x37 + RenderText {#text} at (0,0) size 21x36 + text run at (0,0) width 21: "B" + RenderText {#text} at (0,0) size 0x0 + RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/http/tests/security/cross-origin-xsl-BLOCKED-expected.txt b/LayoutTests/platform/gtk/http/tests/security/cross-origin-xsl-BLOCKED-expected.txt index 5d87f2d..86a7aae 100644 --- a/LayoutTests/platform/gtk/http/tests/security/cross-origin-xsl-BLOCKED-expected.txt +++ b/LayoutTests/platform/gtk/http/tests/security/cross-origin-xsl-BLOCKED-expected.txt @@ -6,3 +6,4 @@ This test loads the XML document in an iframe so that it can call dumpAsText(). -------- Frame: '-->' -------- + diff --git a/LayoutTests/platform/gtk/http/tests/security/cross-origin-xsl-redirect-BLOCKED-expected.txt b/LayoutTests/platform/gtk/http/tests/security/cross-origin-xsl-redirect-BLOCKED-expected.txt index ad5d0d1..7c6daa6 100644 --- a/LayoutTests/platform/gtk/http/tests/security/cross-origin-xsl-redirect-BLOCKED-expected.txt +++ b/LayoutTests/platform/gtk/http/tests/security/cross-origin-xsl-redirect-BLOCKED-expected.txt @@ -6,3 +6,4 @@ This test loads the XML document in an iframe so that it can call dumpAsText(). -------- Frame: '-->' -------- + -- 2.7.4