diff options
14 files changed, 267 insertions, 1 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "46894", + "webkit_revision": "46910", } diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/menulist-style-color-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/menulist-style-color-expected.checksum new file mode 100644 index 0000000..4de6ba1 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/menulist-style-color-expected.checksum @@ -0,0 +1 @@ +d7af5327f12e07c1c747d1db2143d729
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/menulist-style-color-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/menulist-style-color-expected.png Binary files differnew file mode 100644 index 0000000..28aa3af --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/menulist-style-color-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/menulist-style-color-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/menulist-style-color-expected.txt new file mode 100644 index 0000000..927b9e7 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/menulist-style-color-expected.txt @@ -0,0 +1,28 @@ +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 784x584 + RenderMenuList {SELECT} at (2,2) size 63x18 [bgcolor=#DDDDDD] + RenderBlock (anonymous) at (0,0) size 63x18 + RenderText at (4,1) size 40x16 + text run at (4,1) width 40: "Default" + RenderText {#text} at (67,1) size 4x19 + text run at (67,1) width 4: " " + RenderMenuList {SELECT} at (73,2) size 46x18 [color=#FF0000] [bgcolor=#DDDDDD] + RenderBlock (anonymous) at (0,0) size 46x18 + RenderText at (4,1) size 23x16 + text run at (4,1) width 23: "Red" + RenderText {#text} at (121,1) size 4x19 + text run at (121,1) width 4: " " + RenderMenuList {SELECT} at (127,2) size 117x18 [bgcolor=#008000] + RenderBlock (anonymous) at (0,0) size 117x18 + RenderText at (4,1) size 94x16 + text run at (4,1) width 94: "Default on green" + RenderText {#text} at (246,1) size 4x19 + text run at (246,1) width 4: " " + RenderMenuList {SELECT} at (252,2) size 100x18 [color=#FF0000] [bgcolor=#008000] + RenderBlock (anonymous) at (0,0) size 100x18 + RenderText at (4,1) size 77x16 + text run at (4,1) width 77: "Red on green" + RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/text-style-color-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/text-style-color-expected.checksum new file mode 100644 index 0000000..1b894b4 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/text-style-color-expected.checksum @@ -0,0 +1 @@ +9532d985cce4b9248d0a0b6d2e81cc67
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/text-style-color-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/text-style-color-expected.png Binary files differnew file mode 100644 index 0000000..311efb4 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/text-style-color-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/text-style-color-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/text-style-color-expected.txt new file mode 100644 index 0000000..cbf291a --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/text-style-color-expected.txt @@ -0,0 +1,89 @@ +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 784x584 + RenderBlock (anonymous) at (0,0) size 784x20 + RenderText {#text} at (0,0) size 158x19 + text run at (0,0) width 158: "The text should be default:" + RenderBlock {DIV} at (0,28) size 784x46 + RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)] + RenderBlock (anonymous) at (0,10) size 784x26 + RenderText {#text} at (0,3) size 307x19 + text run at (0,3) width 307: "This is a searchable index. Enter search keywords: " + RenderTextControl {ISINDEX} at (309,2) size 157x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)] + RenderBlock {HR} at (0,44) size 784x2 [border: (1px inset #000000)] + RenderBlock (anonymous) at (0,82) size 784x20 + RenderText {#text} at (0,0) size 138x19 + text run at (0,0) width 138: "The text should be red:" + RenderBlock {DIV} at (0,110) size 784x46 + RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)] + RenderBlock (anonymous) at (0,10) size 784x26 + RenderText {#text} at (0,3) size 307x19 + text run at (0,3) width 307: "This is a searchable index. Enter search keywords: " + RenderTextControl {ISINDEX} at (309,2) size 157x22 [color=#FF0000] [bgcolor=#FFFFFF] [border: (2px inset #FF0000)] + RenderBlock {HR} at (0,44) size 784x2 [border: (1px inset #000000)] + RenderBlock (anonymous) at (0,164) size 784x20 + RenderText {#text} at (0,0) size 200x19 + text run at (0,0) width 200: "The text should be gray on green:" + RenderBlock {DIV} at (0,192) size 784x46 + RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)] + RenderBlock (anonymous) at (0,10) size 784x26 + RenderText {#text} at (0,3) size 307x19 + text run at (0,3) width 307: "This is a searchable index. Enter search keywords: " + RenderTextControl {ISINDEX} at (309,2) size 157x22 [bgcolor=#008000] [border: (2px inset #000000)] + RenderBlock {HR} at (0,44) size 784x2 [border: (1px inset #000000)] + RenderBlock (anonymous) at (0,246) size 784x20 + RenderText {#text} at (0,0) size 198x19 + text run at (0,0) width 198: "The text should be red on Green:" + RenderBlock {DIV} at (0,274) size 784x46 + RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)] + RenderBlock (anonymous) at (0,10) size 784x26 + RenderText {#text} at (0,3) size 307x19 + text run at (0,3) width 307: "This is a searchable index. Enter search keywords: " + RenderTextControl {ISINDEX} at (309,2) size 157x22 [color=#FF0000] [bgcolor=#008000] [border: (2px inset #FF0000)] + RenderBlock {HR} at (0,44) size 784x2 [border: (1px inset #000000)] + RenderBlock (anonymous) at (0,328) size 784x26 + RenderTextControl {INPUT} at (2,2) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)] + RenderText {#text} at (159,3) size 4x19 + text run at (159,3) width 4: " " + RenderTextControl {INPUT} at (165,2) size 155x22 [color=#FF0000] [bgcolor=#FFFFFF] [border: (2px inset #FF0000)] + RenderText {#text} at (322,3) size 4x19 + text run at (322,3) width 4: " " + RenderTextControl {INPUT} at (328,2) size 155x22 [bgcolor=#008000] [border: (2px inset #000000)] + RenderText {#text} at (485,3) size 4x19 + text run at (485,3) width 4: " " + RenderTextControl {INPUT} at (491,2) size 155x22 [color=#FF0000] [bgcolor=#008000] [border: (2px inset #FF0000)] + RenderText {#text} at (0,0) size 0x0 +layer at (320,51) size 151x16 + RenderBlock {DIV} at (3,3) size 151x16 + RenderText {#text} at (1,0) size 38x16 + text run at (1,0) width 38: "default" +layer at (320,133) size 151x16 + RenderBlock {DIV} at (3,3) size 151x16 + RenderText {#text} at (1,0) size 18x16 + text run at (1,0) width 18: "red" +layer at (320,215) size 151x16 + RenderBlock {DIV} at (3,3) size 151x16 + RenderText {#text} at (1,0) size 92x16 + text run at (1,0) width 92: "default on green" +layer at (320,297) size 151x16 + RenderBlock {DIV} at (3,3) size 151x16 + RenderText {#text} at (1,0) size 72x16 + text run at (1,0) width 72: "red on green" +layer at (12,341) size 151x16 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 38x16 + text run at (1,0) width 38: "default" +layer at (175,341) size 151x16 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 18x16 + text run at (1,0) width 18: "red" +layer at (338,341) size 151x16 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 92x16 + text run at (1,0) width 92: "default on green" +layer at (501,341) size 151x16 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 72x16 + text run at (1,0) width 72: "red on green" diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/forms/menulist-style-color-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/forms/menulist-style-color-expected.txt new file mode 100644 index 0000000..cacd76f --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/forms/menulist-style-color-expected.txt @@ -0,0 +1,28 @@ +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 784x584 + RenderMenuList {SELECT} at (2,2) size 70x18 [bgcolor=#FFFFFF] + RenderBlock (anonymous) at (0,0) size 70x18 + RenderText at (8,2) size 39x13 + text run at (8,2) width 39: "Default" + RenderText {#text} at (74,1) size 4x18 + text run at (74,1) width 4: " " + RenderMenuList {SELECT} at (80,2) size 52x18 [bgcolor=#FFFFFF] + RenderBlock (anonymous) at (0,0) size 52x18 + RenderText at (8,2) size 21x13 + text run at (8,2) width 21: "Red" + RenderText {#text} at (134,1) size 4x18 + text run at (134,1) width 4: " " + RenderMenuList {SELECT} at (140,2) size 121x18 [bgcolor=#008000] [border: (1px solid #000000)] + RenderBlock (anonymous) at (1,1) size 119x16 + RenderText at (8,1) size 90x13 + text run at (8,1) width 90: "Default on green" + RenderText {#text} at (263,1) size 4x18 + text run at (263,1) width 4: " " + RenderMenuList {SELECT} at (269,2) size 103x18 [color=#FF0000] [bgcolor=#008000] [border: (1px solid #FF0000)] + RenderBlock (anonymous) at (1,1) size 101x16 + RenderText at (8,1) size 72x13 + text run at (8,1) width 72: "Red on green" + RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/menulist-style-color-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/menulist-style-color-expected.checksum new file mode 100644 index 0000000..4f521ea --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/menulist-style-color-expected.checksum @@ -0,0 +1 @@ +3afd6bb8d68706fc5cd37371cbeb8e56
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/menulist-style-color-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/menulist-style-color-expected.png Binary files differnew file mode 100644 index 0000000..904a9d1 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/menulist-style-color-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/menulist-style-color-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/menulist-style-color-expected.txt new file mode 100644 index 0000000..d1b46f6 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/menulist-style-color-expected.txt @@ -0,0 +1,28 @@ +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 784x584
+ RenderMenuList {SELECT} at (2,2) size 65x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderBlock (anonymous) at (1,1) size 63x18
+ RenderText at (4,1) size 40x16
+ text run at (4,1) width 40: "Default"
+ RenderText {#text} at (69,2) size 4x19
+ text run at (69,2) width 4: " "
+ RenderMenuList {SELECT} at (75,2) size 48x20 [color=#FF0000] [bgcolor=#FFFFFF] [border: (1px solid #FF0000)]
+ RenderBlock (anonymous) at (1,1) size 46x18
+ RenderText at (4,1) size 23x16
+ text run at (4,1) width 23: "Red"
+ RenderText {#text} at (125,2) size 4x19
+ text run at (125,2) width 4: " "
+ RenderMenuList {SELECT} at (131,2) size 119x20 [bgcolor=#008000] [border: (1px solid #000000)]
+ RenderBlock (anonymous) at (1,1) size 117x18
+ RenderText at (4,1) size 94x16
+ text run at (4,1) width 94: "Default on green"
+ RenderText {#text} at (252,2) size 4x19
+ text run at (252,2) width 4: " "
+ RenderMenuList {SELECT} at (258,2) size 102x20 [color=#FF0000] [bgcolor=#008000] [border: (1px solid #FF0000)]
+ RenderBlock (anonymous) at (1,1) size 100x18
+ RenderText at (4,1) size 77x16
+ text run at (4,1) width 77: "Red on green"
+ RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/text-style-color-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/text-style-color-expected.checksum new file mode 100644 index 0000000..0662d88 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/text-style-color-expected.checksum @@ -0,0 +1 @@ +aa47cb7d658d4cf34049f2d2d9c9edc4
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/text-style-color-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/text-style-color-expected.png Binary files differnew file mode 100644 index 0000000..57698ac --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/text-style-color-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/text-style-color-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/text-style-color-expected.txt new file mode 100644 index 0000000..9741744 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/text-style-color-expected.txt @@ -0,0 +1,89 @@ +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 784x584
+ RenderBlock (anonymous) at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 158x19
+ text run at (0,0) width 158: "The text should be default:"
+ RenderBlock {DIV} at (0,28) size 784x46
+ RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,10) size 784x26
+ RenderText {#text} at (0,3) size 307x19
+ text run at (0,3) width 307: "This is a searchable index. Enter search keywords: "
+ RenderTextControl {ISINDEX} at (309,2) size 157x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderBlock {HR} at (0,44) size 784x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,82) size 784x20
+ RenderText {#text} at (0,0) size 138x19
+ text run at (0,0) width 138: "The text should be red:"
+ RenderBlock {DIV} at (0,110) size 784x46
+ RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,10) size 784x26
+ RenderText {#text} at (0,3) size 307x19
+ text run at (0,3) width 307: "This is a searchable index. Enter search keywords: "
+ RenderTextControl {ISINDEX} at (309,2) size 157x22 [color=#FF0000] [bgcolor=#FFFFFF] [border: (2px inset #FF0000)]
+ RenderBlock {HR} at (0,44) size 784x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,164) size 784x20
+ RenderText {#text} at (0,0) size 200x19
+ text run at (0,0) width 200: "The text should be gray on green:"
+ RenderBlock {DIV} at (0,192) size 784x46
+ RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,10) size 784x26
+ RenderText {#text} at (0,3) size 307x19
+ text run at (0,3) width 307: "This is a searchable index. Enter search keywords: "
+ RenderTextControl {ISINDEX} at (309,2) size 157x22 [bgcolor=#008000] [border: (2px inset #000000)]
+ RenderBlock {HR} at (0,44) size 784x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,246) size 784x20
+ RenderText {#text} at (0,0) size 198x19
+ text run at (0,0) width 198: "The text should be red on Green:"
+ RenderBlock {DIV} at (0,274) size 784x46
+ RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,10) size 784x26
+ RenderText {#text} at (0,3) size 307x19
+ text run at (0,3) width 307: "This is a searchable index. Enter search keywords: "
+ RenderTextControl {ISINDEX} at (309,2) size 157x22 [color=#FF0000] [bgcolor=#008000] [border: (2px inset #FF0000)]
+ RenderBlock {HR} at (0,44) size 784x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,328) size 784x26
+ RenderTextControl {INPUT} at (2,2) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (159,3) size 4x19
+ text run at (159,3) width 4: " "
+ RenderTextControl {INPUT} at (165,2) size 155x22 [color=#FF0000] [bgcolor=#FFFFFF] [border: (2px inset #FF0000)]
+ RenderText {#text} at (322,3) size 4x19
+ text run at (322,3) width 4: " "
+ RenderTextControl {INPUT} at (328,2) size 155x22 [bgcolor=#008000] [border: (2px inset #000000)]
+ RenderText {#text} at (485,3) size 4x19
+ text run at (485,3) width 4: " "
+ RenderTextControl {INPUT} at (491,2) size 155x22 [color=#FF0000] [bgcolor=#008000] [border: (2px inset #FF0000)]
+ RenderText {#text} at (0,0) size 0x0
+layer at (320,51) size 151x16
+ RenderBlock {DIV} at (3,3) size 151x16
+ RenderText {#text} at (1,0) size 38x16
+ text run at (1,0) width 38: "default"
+layer at (320,133) size 151x16
+ RenderBlock {DIV} at (3,3) size 151x16
+ RenderText {#text} at (1,0) size 18x16
+ text run at (1,0) width 18: "red"
+layer at (320,215) size 151x16
+ RenderBlock {DIV} at (3,3) size 151x16
+ RenderText {#text} at (1,0) size 92x16
+ text run at (1,0) width 92: "default on green"
+layer at (320,297) size 151x16
+ RenderBlock {DIV} at (3,3) size 151x16
+ RenderText {#text} at (1,0) size 72x16
+ text run at (1,0) width 72: "red on green"
+layer at (12,341) size 151x16
+ RenderBlock {DIV} at (2,3) size 151x16
+ RenderText {#text} at (1,0) size 38x16
+ text run at (1,0) width 38: "default"
+layer at (175,341) size 151x16
+ RenderBlock {DIV} at (2,3) size 151x16
+ RenderText {#text} at (1,0) size 18x16
+ text run at (1,0) width 18: "red"
+layer at (338,341) size 151x16
+ RenderBlock {DIV} at (2,3) size 151x16
+ RenderText {#text} at (1,0) size 92x16
+ text run at (1,0) width 92: "default on green"
+layer at (501,341) size 151x16
+ RenderBlock {DIV} at (2,3) size 151x16
+ RenderText {#text} at (1,0) size 72x16
+ text run at (1,0) width 72: "red on green"
|