summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorvictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-14 21:14:06 +0000
committervictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-14 21:14:06 +0000
commit48676d6ed4d082f8ce16442df6103786e9c51fb9 (patch)
tree62038df2a63cd2e0e21a8dd91716357317de7454 /webkit
parentec28f8e18f1ae9593b07a055aa05fd2920fcb044 (diff)
downloadchromium_src-48676d6ed4d082f8ce16442df6103786e9c51fb9.zip
chromium_src-48676d6ed4d082f8ce16442df6103786e9c51fb9.tar.gz
chromium_src-48676d6ed4d082f8ce16442df6103786e9c51fb9.tar.bz2
Rebaselining layout test "border-radius-huge-assert" introduced by webkit merge 44202:44252.
TBR=dglazkov TEST=layout test BUG=12881 Review URL: http://codereview.chromium.org/155452 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-radius-huge-assert-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-radius-huge-assert-expected.pngbin14827 -> 15913 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/border-radius-huge-assert-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/border-radius-huge-assert-expected.pngbin5669 -> 6947 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/border-radius-huge-assert-expected.txt4
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt1
6 files changed, 4 insertions, 5 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-radius-huge-assert-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-radius-huge-assert-expected.checksum
index 9b4722f..a1656c1 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-radius-huge-assert-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-radius-huge-assert-expected.checksum
@@ -1 +1 @@
-1556c34cb665b43875111616472bba39 \ No newline at end of file
+94641b35d780bbe61260717296eeef4d \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-radius-huge-assert-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-radius-huge-assert-expected.png
index 53f6434..644b2c7 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-radius-huge-assert-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-radius-huge-assert-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/border-radius-huge-assert-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/border-radius-huge-assert-expected.checksum
index bf8b907..8b331f0 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/border-radius-huge-assert-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/border-radius-huge-assert-expected.checksum
@@ -1 +1 @@
-2c8d34f87af0d021c9aa3be07ca14644 \ No newline at end of file
+0a3b70706130976ea46c221d55161619 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/border-radius-huge-assert-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/border-radius-huge-assert-expected.png
index 4526f6c..9065bd6 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/border-radius-huge-assert-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/border-radius-huge-assert-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/border-radius-huge-assert-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/border-radius-huge-assert-expected.txt
index a0c0368..954b74d7 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/border-radius-huge-assert-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/border-radius-huge-assert-expected.txt
@@ -17,8 +17,8 @@ layer at (0,0) size 800x600
RenderText {#text} at (245,20) size 4x19
text run at (245,20) width 4: "."
RenderBlock {P} at (0,56) size 784x20
- RenderText {#text} at (0,0) size 273x19
- text run at (0,0) width 273: "There should be four identical squares below."
+ RenderText {#text} at (0,0) size 292x19
+ text run at (0,0) width 292: "There should be three squres and a circle below."
RenderBlock {DIV} at (0,92) size 56x56 [bgcolor=#C0C0C0] [border: (3px solid #000000)]
RenderBlock {DIV} at (0,158) size 56x56 [bgcolor=#C0C0C0] [border: (3px solid #000000)]
RenderBlock {DIV} at (0,224) size 56x56 [bgcolor=#C0C0C0] [border: (3px solid #000000)]
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index e39f6d4..b0204f6 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2651,7 +2651,6 @@ BUG12477 : LayoutTests/http/tests/security/drag-over-remote-content-iframe.html
BUG12881 WIN LINUX : LayoutTests/fast/forms/isindex-placeholder.html = FAIL
BUG12881 WIN LINUX : LayoutTests/fast/box-shadow/border-radius-big.html = FAIL
BUG12881 WIN LINUX : LayoutTests/fast/borders/border-radius-constraints.html = FAIL
-BUG12881 WIN LINUX : LayoutTests/fast/borders/border-radius-huge-assert.html = FAIL
BUG12881 WIN LINUX : LayoutTests/fast/borders/border-radius-split-inline.html = FAIL
// WebKit 44202:44252 introduced new failures (old tests)