summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-15 00:40:44 +0000
committeratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-15 00:40:44 +0000
commitaf68d4a11230caa2ee00906e080ba49b2b21030d (patch)
tree55f9a7d6beb05786c27416e064f1ac5359a60899 /webkit
parenta572e426aa2f2d0f66866c5264454b502a760e69 (diff)
downloadchromium_src-af68d4a11230caa2ee00906e080ba49b2b21030d.zip
chromium_src-af68d4a11230caa2ee00906e080ba49b2b21030d.tar.gz
chromium_src-af68d4a11230caa2ee00906e080ba49b2b21030d.tar.bz2
Roll webkit to r53289, update expectations and rebaselined non-standard-checkbox-size-expected.png.
TBR=yaar Review URL: http://codereview.chromium.org/552006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/non-standard-checkbox-size-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/non-standard-checkbox-size-expected.pngbin0 -> 5867 bytes
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
3 files changed, 5 insertions, 0 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/non-standard-checkbox-size-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/non-standard-checkbox-size-expected.checksum
new file mode 100644
index 0000000..c4ef812
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/non-standard-checkbox-size-expected.checksum
@@ -0,0 +1 @@
+3561d28f3c41f52aeeed2e2f622547b9 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/non-standard-checkbox-size-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/non-standard-checkbox-size-expected.png
new file mode 100644
index 0000000..054ab03
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/non-standard-checkbox-size-expected.png
Binary files differ
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index af107c8..7fb9c47a 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3074,4 +3074,8 @@ BUG_ATWILSON WIN LINUX : storage/transaction-error-callback.html = CRASH PASS
BUG_ATWILSON MAC : storage/transaction-error-callback.html = TEXT PASS
BUG_ATWILSON MAC : svg/custom/resource-invalidate-on-target-update.svg = IMAGE PASS
+// Bugs from rolling from 53275:53289
+BUG32305 : fast/loader/onload-willSendRequest-null-for-frame.html = TEXT
+BUG32307 : fast/css/non-standard-checkbox-size.html = IMAGE+TEXT
+
BUG32308 : fast/frames/cached-frame-counter.html = TIMEOUT