summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorhamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-21 09:10:51 +0000
committerhamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-21 09:10:51 +0000
commit2f57a6594f6e18b3a903521845e96c5f29d475de (patch)
tree4e6f3bb891f4ac6d7131bce170b1441d984c7d41 /webkit
parentffe83836af2fc0ccaa25aebc046c050e82ea0575 (diff)
downloadchromium_src-2f57a6594f6e18b3a903521845e96c5f29d475de.zip
chromium_src-2f57a6594f6e18b3a903521845e96c5f29d475de.tar.gz
chromium_src-2f57a6594f6e18b3a903521845e96c5f29d475de.tar.bz2
Update expected results for chromium-win LayoutTests/fast/forms/select-style.
Upstream change https://bugs.webkit.org/show_bug.cgi?id=25742 modified the test. Original patch by tyoshino@google.com. (see http://codereview.chromium.org/115623) r=levin BUG=12350 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-style-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-style-expected.pngbin4186 -> 10492 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-style-expected.txt66
3 files changed, 64 insertions, 4 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-style-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-style-expected.checksum
index 39581e8..9c138c0 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-style-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-style-expected.checksum
@@ -1 +1 @@
-ada387809b064f593987b7b8c04deac1 \ No newline at end of file
+edd371f686a64794bba8b6ed89462668 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-style-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-style-expected.png
index 7ada278..16e7463 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-style-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-style-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-style-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-style-expected.txt
index 491df9e..feba96d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-style-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-style-expected.txt
@@ -3,11 +3,71 @@ layer 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
- RenderText {#text} at (0,0) size 529x19
+ RenderText {#text} at (0,0) size 525x19
text run at (0,0) width 239: "This tests that styled popups look right. "
- text run at (239,0) width 290: "(Aqua for now- later, we will honor the styling). "
- RenderBR {BR} at (0,0) size 0x0
+ text run at (239,0) width 286: "(Aqua for now- later, we will honor the styling)."
+ RenderBR {BR} at (525,15) size 0x0
RenderMenuList {SELECT} at (2,22) size 47x20 [bgcolor=#FF0000] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 45x18
RenderText at (4,1) size 22x16
text run at (4,1) width 22: "test"
+ RenderText {#text} at (51,22) size 4x19
+ text run at (51,22) width 4: " "
+ RenderBR {BR} at (55,37) size 0x0
+ RenderText {#text} at (0,44) size 504x19
+ text run at (0,44) width 504: "This tests that background color is white by default regardless of the parent element."
+ RenderBR {BR} at (504,59) size 0x0
+ RenderInline {SPAN} at (0,0) size 65x29 [bgcolor=#FF0000]
+ RenderText {#text} at (0,0) size 0x0
+ RenderMenuList {SELECT} at (7,66) size 47x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderBlock (anonymous) at (1,1) size 45x18
+ RenderText at (4,1) size 22x16
+ text run at (4,1) width 22: "test"
+ RenderText {#text} at (56,66) size 4x19
+ text run at (56,66) width 4: " "
+ RenderText {#text} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,88) size 594x19
+ text run at (0,88) width 594: "This tests that background color is inherited from the parent if background-color:inherit is specified."
+ RenderBR {BR} at (594,103) size 0x0
+ RenderInline {SPAN} at (0,0) size 65x29 [bgcolor=#FF0000]
+ RenderText {#text} at (0,0) size 0x0
+ RenderMenuList {SELECT} at (7,110) size 47x20 [border: (1px solid #000000)]
+ RenderBlock (anonymous) at (1,1) size 45x18
+ RenderText at (4,1) size 22x16
+ text run at (4,1) width 22: "test"
+ RenderText {#text} at (56,110) size 4x19
+ text run at (56,110) width 4: " "
+ RenderText {#text} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,132) size 612x19
+ text run at (0,132) width 612: "This tests that background color is the same as the parent if background-color:transparent is specified."
+ RenderBR {BR} at (612,147) size 0x0
+ RenderInline {SPAN} at (0,0) size 65x29 [bgcolor=#FF0000]
+ RenderText {#text} at (0,0) size 0x0
+ RenderMenuList {SELECT} at (7,154) size 47x20 [border: (1px solid #000000)]
+ RenderBlock (anonymous) at (1,1) size 45x18
+ RenderText at (4,1) size 22x16
+ text run at (4,1) width 22: "test"
+ RenderText {#text} at (56,154) size 4x19
+ text run at (56,154) width 4: " "
+ RenderText {#text} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,176) size 470x19
+ text run at (0,176) width 470: "This tests that background is white if only background-image:none is specified."
+ RenderBR {BR} at (470,191) size 0x0
+ RenderMenuList {SELECT} at (2,198) size 47x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderBlock (anonymous) at (1,1) size 45x18
+ RenderText at (4,1) size 22x16
+ text run at (4,1) width 22: "test"
+ RenderText {#text} at (51,198) size 4x19
+ text run at (51,198) width 4: " "
+ RenderBR {BR} at (55,213) size 0x0
+ RenderText {#text} at (0,220) size 396x19
+ text run at (0,220) width 396: "This tests that the image specified for background-image is visible."
+ RenderBR {BR} at (396,235) size 0x0
+ RenderMenuList {SELECT} at (2,242) size 47x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderBlock (anonymous) at (1,1) size 45x18
+ RenderText at (4,1) size 22x16
+ text run at (4,1) width 22: "test"
+ RenderText {#text} at (0,0) size 0x0