From 78e4c0f9f4e4115930544c980f8a413e54bb879f Mon Sep 17 00:00:00 2001 From: "philn@webkit.org" Date: Mon, 23 Jan 2012 09:59:08 +0000 Subject: [PATCH] Unreviewed, GTK rebaseline after r101742. * platform/gtk/fast/forms/input-placeholder-visibility-1-expected.txt: * platform/gtk/fast/forms/input-placeholder-visibility-3-expected.txt: * platform/gtk/fast/forms/placeholder-position-expected.txt: * platform/gtk/fast/forms/placeholder-pseudo-style-expected.txt: * platform/gtk/fast/forms/search-styled-expected.txt: * platform/gtk/fast/forms/textarea-placeholder-pseudo-style-expected.txt: * platform/gtk/fast/forms/textarea-placeholder-visibility-1-expected.txt: * platform/gtk/fast/forms/textarea-placeholder-visibility-2-expected.txt: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105599 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 13 ++++ .../input-placeholder-visibility-1-expected.txt | 4 ++ .../input-placeholder-visibility-3-expected.txt | 4 ++ .../fast/forms/placeholder-position-expected.txt | 80 +++++++++++----------- .../forms/placeholder-pseudo-style-expected.txt | 32 ++++----- .../gtk/fast/forms/search-styled-expected.txt | 2 +- .../textarea-placeholder-pseudo-style-expected.txt | 28 ++++---- .../textarea-placeholder-visibility-1-expected.txt | 3 + .../textarea-placeholder-visibility-2-expected.txt | 3 + 9 files changed, 95 insertions(+), 74 deletions(-) diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 2f697bf..9a00ecf 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,5 +1,18 @@ 2012-01-23 Philippe Normand + Unreviewed, GTK rebaseline after r101742. + + * platform/gtk/fast/forms/input-placeholder-visibility-1-expected.txt: + * platform/gtk/fast/forms/input-placeholder-visibility-3-expected.txt: + * platform/gtk/fast/forms/placeholder-position-expected.txt: + * platform/gtk/fast/forms/placeholder-pseudo-style-expected.txt: + * platform/gtk/fast/forms/search-styled-expected.txt: + * platform/gtk/fast/forms/textarea-placeholder-pseudo-style-expected.txt: + * platform/gtk/fast/forms/textarea-placeholder-visibility-1-expected.txt: + * platform/gtk/fast/forms/textarea-placeholder-visibility-2-expected.txt: + +2012-01-23 Philippe Normand + Unreviewed, GTK gardening, marked 2 tests as flaky on Debug and unskipped another needing new baselines. diff --git a/LayoutTests/platform/gtk/fast/forms/input-placeholder-visibility-1-expected.txt b/LayoutTests/platform/gtk/fast/forms/input-placeholder-visibility-1-expected.txt index 35b6409..8862000 100644 --- a/LayoutTests/platform/gtk/fast/forms/input-placeholder-visibility-1-expected.txt +++ b/LayoutTests/platform/gtk/fast/forms/input-placeholder-visibility-1-expected.txt @@ -12,4 +12,8 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 0x0 layer at (13,47) size 187x18 RenderBlock {DIV} at (3,3) size 187x18 +layer at (13,47) size 187x18 + RenderBlock {DIV} at (3,3) size 187x18 [color=#A9A9A9] + RenderText {#text} at (1,0) size 85x17 + text run at (1,0) width 85: "Placeholder" caret: position 0 of child 0 {DIV} of {#shadow-root} of child 1 {INPUT} of child 3 {DIV} of body diff --git a/LayoutTests/platform/gtk/fast/forms/input-placeholder-visibility-3-expected.txt b/LayoutTests/platform/gtk/fast/forms/input-placeholder-visibility-3-expected.txt index acf6004..33561cb 100644 --- a/LayoutTests/platform/gtk/fast/forms/input-placeholder-visibility-3-expected.txt +++ b/LayoutTests/platform/gtk/fast/forms/input-placeholder-visibility-3-expected.txt @@ -13,4 +13,8 @@ layer at (0,0) size 800x600 layer at (13,47) size 187x18 RenderBlock {DIV} at (3,3) size 187x18 RenderBR {BR} at (1,0) size 0x17 +layer at (13,47) size 187x18 + RenderBlock {DIV} at (3,3) size 187x18 [color=#A9A9A9] + RenderText {#text} at (1,0) size 85x17 + text run at (1,0) width 85: "Placeholder" caret: position 0 of child 0 {BR} of child 0 {DIV} of {#shadow-root} of child 1 {INPUT} of child 3 {DIV} of body diff --git a/LayoutTests/platform/gtk/fast/forms/placeholder-position-expected.txt b/LayoutTests/platform/gtk/fast/forms/placeholder-position-expected.txt index d06597d..57ff724 100644 --- a/LayoutTests/platform/gtk/fast/forms/placeholder-position-expected.txt +++ b/LayoutTests/platform/gtk/fast/forms/placeholder-position-expected.txt @@ -49,78 +49,76 @@ layer at (0,0) size 800x600 RenderBR {BR} at (197,394) size 0x0 layer at (13,13) size 171x18 RenderBlock {DIV} at (0,0) size 171x18 +layer at (13,13) size 171x18 + RenderBlock {DIV} at (3,3) size 171x18 [color=#A9A9A9] + RenderText {#text} at (1,0) size 83x17 + text run at (1,0) width 83: "placeholder" layer at (13,41) size 187x18 RenderBlock {DIV} at (3,3) size 187x18 +layer at (13,41) size 187x18 + RenderBlock {DIV} at (3,3) size 187x18 [color=#A9A9A9] + RenderText {#text} at (1,0) size 83x17 + text run at (1,0) width 83: "placeholder" layer at (13,69) size 171x18 RenderBlock {DIV} at (0,0) size 171x18 +layer at (13,69) size 171x18 + RenderBlock {DIV} at (3,3) size 171x18 [color=#A9A9A9] + RenderText {#text} at (87,0) size 83x17 + text run at (87,0) width 83: "placeholder" layer at (29,97) size 155x18 RenderBlock {DIV} at (0,0) size 155x18 +layer at (29,97) size 155x18 + RenderBlock {DIV} at (19,3) size 155x18 [color=#A9A9A9] + RenderText {#text} at (1,0) size 83x17 + text run at (1,0) width 83: "placeholder" layer at (10,122) size 202x42 clip at (11,123) size 200x40 RenderTextControl {TEXTAREA} at (2,114) size 202x42 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 196x18 + RenderBlock {DIV} at (3,3) size 196x18 [color=#A9A9A9] + RenderText {#text} at (0,0) size 83x17 + text run at (0,0) width 83: "placeholder" layer at (13,171) size 187x18 RenderBlock {DIV} at (3,3) size 187x18 +layer at (13,171) size 187x18 + RenderBlock {DIV} at (3,3) size 187x18 [color=#A9A9A9] + RenderText {#text} at (1,0) size 83x17 + text run at (1,0) width 83: "placeholder" layer at (10,210) size 202x55 clip at (11,211) size 200x53 RenderTextControl {TEXTAREA} at (2,202) size 202x55 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,16) size 196x18 + RenderBlock {DIV} at (3,16) size 196x18 [color=#A9A9A9] + RenderText {#text} at (0,0) size 83x17 + text run at (0,0) width 83: "placeholder" layer at (19,278) size 168x17 RenderBlock {DIV} at (6,6) size 168x17 +layer at (19,278) size 168x17 + RenderBlock {DIV} at (6,6) size 168x17 [color=#A9A9A9] + RenderText {#text} at (1,0) size 78x17 + text run at (1,0) width 78: "placeholder" layer at (13,311) size 187x25 RenderBlock {DIV} at (3,3) size 187x25 RenderText {#text} at (1,4) size 41x17 text run at (1,4) width 41: "Value" layer at (214,311) size 187x25 RenderBlock {DIV} at (3,3) size 187x25 +layer at (214,311) size 187x25 + RenderBlock {DIV} at (3,3) size 187x25 [color=#A9A9A9] + RenderText {#text} at (1,4) size 83x17 + text run at (1,4) width 83: "placeholder" layer at (13,346) size 187x18 RenderBlock {DIV} at (3,3) size 187x18 RenderText {#text} at (73,0) size 41x17 text run at (73,0) width 41: "Value" layer at (214,346) size 187x18 RenderBlock {DIV} at (3,3) size 187x18 -layer at (415,346) size 187x18 - RenderBlock {DIV} at (3,3) size 187x18 -layer at (13,13) size 171x18 - RenderBlock (relative positioned) {DIV} at (3,3) size 171x18 [color=#A9A9A9] - RenderText {#text} at (1,0) size 83x17 - text run at (1,0) width 83: "placeholder" -layer at (13,41) size 187x18 - RenderBlock (relative positioned) {DIV} at (3,3) size 187x18 [color=#A9A9A9] - RenderText {#text} at (1,0) size 83x17 - text run at (1,0) width 83: "placeholder" -layer at (13,69) size 171x18 - RenderBlock (relative positioned) {DIV} at (3,3) size 171x18 [color=#A9A9A9] - RenderText {#text} at (87,0) size 83x17 - text run at (87,0) width 83: "placeholder" -layer at (29,97) size 155x18 - RenderBlock (relative positioned) {DIV} at (19,3) size 155x18 [color=#A9A9A9] - RenderText {#text} at (1,0) size 83x17 - text run at (1,0) width 83: "placeholder" -layer at (13,125) size 196x18 - RenderBlock (relative positioned) {DIV} at (3,3) size 196x18 [color=#A9A9A9] - RenderText {#text} at (0,0) size 83x17 - text run at (0,0) width 83: "placeholder" -layer at (13,171) size 187x18 - RenderBlock (relative positioned) {DIV} at (3,3) size 187x18 [color=#A9A9A9] - RenderText {#text} at (1,0) size 83x17 - text run at (1,0) width 83: "placeholder" -layer at (13,226) size 196x18 - RenderBlock (relative positioned) {DIV} at (3,16) size 196x18 [color=#A9A9A9] - RenderText {#text} at (0,0) size 83x17 - text run at (0,0) width 83: "placeholder" -layer at (19,278) size 168x17 - RenderBlock (relative positioned) {DIV} at (6,6) size 168x17 [color=#A9A9A9] - RenderText {#text} at (1,0) size 78x17 - text run at (1,0) width 78: "placeholder" -layer at (214,311) size 187x25 - RenderBlock (relative positioned) {DIV} at (3,3) size 187x25 [color=#A9A9A9] - RenderText {#text} at (1,4) size 83x17 - text run at (1,4) width 83: "placeholder" layer at (214,346) size 187x18 - RenderBlock (relative positioned) {DIV} at (3,3) size 187x18 [color=#A9A9A9] + RenderBlock {DIV} at (3,3) size 187x18 [color=#A9A9A9] RenderText {#text} at (52,0) size 83x17 text run at (52,0) width 83: "placeholder" layer at (415,346) size 187x18 - RenderBlock (relative positioned) {DIV} at (3,3) size 187x18 [color=#A9A9A9] + RenderBlock {DIV} at (3,3) size 187x18 +layer at (415,346) size 187x18 + RenderBlock {DIV} at (3,3) size 187x18 [color=#A9A9A9] RenderText {#text} at (52,0) size 83x17 text run at (52,0) width 83: "placeholder" layer at (10,371) size 193x38 @@ -128,6 +126,6 @@ layer at (10,371) size 193x38 layer at (13,388) size 187x18 RenderBlock {DIV} at (3,17) size 187x18 layer at (13,388) size 187x18 - RenderBlock (relative positioned) {DIV} at (3,17) size 187x18 [color=#A9A9A9] + RenderBlock {DIV} at (3,17) size 187x18 [color=#A9A9A9] RenderText {#text} at (1,0) size 83x17 text run at (1,0) width 83: "placeholder" diff --git a/LayoutTests/platform/gtk/fast/forms/placeholder-pseudo-style-expected.txt b/LayoutTests/platform/gtk/fast/forms/placeholder-pseudo-style-expected.txt index 2296f04..0f0e0be 100644 --- a/LayoutTests/platform/gtk/fast/forms/placeholder-pseudo-style-expected.txt +++ b/LayoutTests/platform/gtk/fast/forms/placeholder-pseudo-style-expected.txt @@ -29,37 +29,37 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 0x0 layer at (13,31) size 187x18 RenderBlock {DIV} at (3,3) size 187x18 -layer at (214,31) size 171x18 - RenderBlock {DIV} at (0,0) size 171x18 -layer at (415,31) size 187x18 - RenderBlock {DIV} at (3,3) size 187x18 -layer at (13,59) size 187x18 - RenderBlock {DIV} at (3,3) size 187x18 [color=#545454] -layer at (214,59) size 187x18 - RenderBlock {DIV} at (3,3) size 187x18 -layer at (415,59) size 187x18 - RenderBlock {DIV} at (3,3) size 187x18 layer at (13,31) size 187x18 - RenderBlock (relative positioned) {DIV} at (3,3) size 187x18 [color=#640000] + RenderBlock {DIV} at (3,3) size 187x18 [color=#640000] RenderText {#text} at (1,0) size 26x17 text run at (1,0) width 26: "text" layer at (214,31) size 171x18 - RenderBlock (relative positioned) {DIV} at (3,3) size 171x18 [color=#640000] + RenderBlock {DIV} at (0,0) size 171x18 +layer at (214,31) size 171x18 + RenderBlock {DIV} at (3,3) size 171x18 [color=#640000] RenderText {#text} at (1,0) size 49x17 text run at (1,0) width 49: "search" layer at (415,31) size 187x18 - RenderBlock (relative positioned) {DIV} at (3,3) size 187x18 [color=#640000] + RenderBlock {DIV} at (3,3) size 187x18 +layer at (415,31) size 187x18 + RenderBlock {DIV} at (3,3) size 187x18 [color=#640000] RenderText {#text} at (1,0) size 69x17 text run at (1,0) width 69: "password" layer at (13,59) size 187x18 - RenderBlock (relative positioned) {DIV} at (3,3) size 187x18 [color=#640000] + RenderBlock {DIV} at (3,3) size 187x18 [color=#545454] +layer at (13,59) size 187x18 + RenderBlock {DIV} at (3,3) size 187x18 [color=#640000] RenderText {#text} at (1,0) size 90x17 text run at (1,0) width 90: "disabled text" layer at (214,59) size 187x18 - RenderBlock (relative positioned) {DIV} at (3,3) size 187x18 [color=#A9A9A9] + RenderBlock {DIV} at (3,3) size 187x18 +layer at (214,59) size 187x18 + RenderBlock {DIV} at (3,3) size 187x18 [color=#A9A9A9] RenderText {#text} at (1,0) size 49x17 text run at (1,0) width 49: "default" layer at (415,59) size 187x18 - RenderBlock (relative positioned) {DIV} at (3,3) size 187x18 [color=#A9A9A9] + RenderBlock {DIV} at (3,3) size 187x18 +layer at (415,59) size 187x18 + RenderBlock {DIV} at (3,3) size 187x18 [color=#A9A9A9] RenderText {#text} at (1,0) size 113x17 text run at (1,0) width 113: "default disabled" diff --git a/LayoutTests/platform/gtk/fast/forms/search-styled-expected.txt b/LayoutTests/platform/gtk/fast/forms/search-styled-expected.txt index 678755d..b710414 100644 --- a/LayoutTests/platform/gtk/fast/forms/search-styled-expected.txt +++ b/LayoutTests/platform/gtk/fast/forms/search-styled-expected.txt @@ -12,6 +12,6 @@ layer at (0,0) size 800x40 layer at (39,14) size 104x12 RenderBlock {DIV} at (0,0) size 104x12 layer at (39,14) size 104x12 - RenderBlock (relative positioned) {DIV} at (29,4) size 104x12 [color=#A9A9A9] + RenderBlock {DIV} at (29,4) size 104x12 [color=#A9A9A9] RenderText {#text} at (1,0) size 88x12 text run at (1,0) width 88: "Search for Events" diff --git a/LayoutTests/platform/gtk/fast/forms/textarea-placeholder-pseudo-style-expected.txt b/LayoutTests/platform/gtk/fast/forms/textarea-placeholder-pseudo-style-expected.txt index 934fa30..e4d5157 100644 --- a/LayoutTests/platform/gtk/fast/forms/textarea-placeholder-pseudo-style-expected.txt +++ b/LayoutTests/platform/gtk/fast/forms/textarea-placeholder-pseudo-style-expected.txt @@ -16,28 +16,24 @@ layer at (0,0) size 800x600 layer at (10,28) size 202x42 clip at (11,29) size 200x40 RenderTextControl {TEXTAREA} at (2,20) size 202x42 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 196x18 + RenderBlock {DIV} at (3,3) size 196x18 [color=#640000] + RenderText {#text} at (0,0) size 26x17 + text run at (0,0) width 26: "text" layer at (220,28) size 202x42 clip at (221,29) size 200x40 RenderTextControl {TEXTAREA} at (212,20) size 202x42 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 196x18 [color=#545454] + RenderBlock {DIV} at (3,3) size 196x18 [color=#640000] + RenderText {#text} at (0,0) size 90x17 + text run at (0,0) width 90: "disabled text" layer at (430,28) size 202x42 clip at (431,29) size 200x40 RenderTextControl {TEXTAREA} at (422,20) size 202x42 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 196x18 + RenderBlock {DIV} at (3,3) size 196x18 [color=#A9A9A9] + RenderText {#text} at (0,0) size 49x17 + text run at (0,0) width 49: "default" layer at (10,78) size 202x42 clip at (11,79) size 200x40 RenderTextControl {TEXTAREA} at (2,70) size 202x42 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 196x18 [color=#545454] -layer at (13,31) size 196x18 - RenderBlock (relative positioned) {DIV} at (3,3) size 196x18 [color=#640000] - RenderText {#text} at (0,0) size 26x17 - text run at (0,0) width 26: "text" -layer at (223,31) size 196x18 - RenderBlock (relative positioned) {DIV} at (3,3) size 196x18 [color=#640000] - RenderText {#text} at (0,0) size 90x17 - text run at (0,0) width 90: "disabled text" -layer at (433,31) size 196x18 - RenderBlock (relative positioned) {DIV} at (3,3) size 196x18 [color=#A9A9A9] - RenderText {#text} at (0,0) size 49x17 - text run at (0,0) width 49: "default" -layer at (13,81) size 196x18 - RenderBlock (relative positioned) {DIV} at (3,3) size 196x18 [color=#A9A9A9] - RenderText {#text} at (0,0) size 113x17 - text run at (0,0) width 113: "default disabled" + RenderBlock {DIV} at (3,3) size 196x18 [color=#A9A9A9] + RenderText {#text} at (0,0) size 113x17 + text run at (0,0) width 113: "default disabled" diff --git a/LayoutTests/platform/gtk/fast/forms/textarea-placeholder-visibility-1-expected.txt b/LayoutTests/platform/gtk/fast/forms/textarea-placeholder-visibility-1-expected.txt index bb47602..e90ddb0 100644 --- a/LayoutTests/platform/gtk/fast/forms/textarea-placeholder-visibility-1-expected.txt +++ b/LayoutTests/platform/gtk/fast/forms/textarea-placeholder-visibility-1-expected.txt @@ -13,4 +13,7 @@ layer at (10,44) size 202x42 clip at (11,45) size 200x40 RenderTextControl {TEXTAREA} at (2,2) size 202x42 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 196x18 RenderBR {BR} at (0,0) size 0x17 + RenderBlock {DIV} at (3,3) size 196x18 [color=#A9A9A9] + RenderText {#text} at (0,0) size 85x17 + text run at (0,0) width 85: "Placeholder" caret: position 0 of child 0 {BR} of child 0 {DIV} of {#shadow-root} of child 1 {TEXTAREA} of child 3 {DIV} of body diff --git a/LayoutTests/platform/gtk/fast/forms/textarea-placeholder-visibility-2-expected.txt b/LayoutTests/platform/gtk/fast/forms/textarea-placeholder-visibility-2-expected.txt index d37278d..5aa049a 100644 --- a/LayoutTests/platform/gtk/fast/forms/textarea-placeholder-visibility-2-expected.txt +++ b/LayoutTests/platform/gtk/fast/forms/textarea-placeholder-visibility-2-expected.txt @@ -12,4 +12,7 @@ layer at (0,0) size 800x600 layer at (10,44) size 202x42 clip at (11,45) size 200x40 RenderTextControl {TEXTAREA} at (2,2) size 202x42 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 196x18 + RenderBlock {DIV} at (3,3) size 196x18 [color=#A9A9A9] + RenderText {#text} at (0,0) size 85x17 + text run at (0,0) width 85: "Placeholder" caret: position 0 of child 0 {DIV} of {#shadow-root} of child 1 {TEXTAREA} of child 3 {DIV} of body -- 2.7.4