summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-05 22:31:14 +0000
committervictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-05 22:31:14 +0000
commita1425a52446f61c86af9956f2aea6b4c4c7cc814 (patch)
tree641a504402c1bab4da3a57150b73ec47bb0af905
parentb429982e9e25eafd853036f210c299a0ea56585a (diff)
downloadchromium_src-a1425a52446f61c86af9956f2aea6b4c4c7cc814.zip
chromium_src-a1425a52446f61c86af9956f2aea6b4c4c7cc814.tar.gz
chromium_src-a1425a52446f61c86af9956f2aea6b4c4c7cc814.tar.bz2
Rebaseline due to the upstream patch: http://trac.webkit.org/changeset/50315
R=japhet BUG=none TEST=none Review URL: http://codereview.chromium.org/369007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31145 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.pngbin18471 -> 18172 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.pngbin26797 -> 0 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/events/click-focus-anchor-expected.txt10
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.pngbin6991 -> 6750 bytes
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt5
8 files changed, 2 insertions, 18 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.checksum
index 081a32f..7612e21 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.checksum
@@ -1 +1 @@
-c91054b984b17ed5229ba18f95f5f16f \ No newline at end of file
+250d9c521cc71ea81a232740c0551b55 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.png
index 08861ed..c2b5b28 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.checksum
deleted file mode 100644
index 44ba894..0000000
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-f0d67a4e818b7b4b746bea7e4b3305e6 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.png
deleted file mode 100644
index 2b402d6..0000000
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.png
+++ /dev/null
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/events/click-focus-anchor-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/events/click-focus-anchor-expected.txt
deleted file mode 100644
index fbd644d..0000000
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/events/click-focus-anchor-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-This test ensures that we can click to focus an a element. Click on the element below.
-
-Focusable anchor with tab index
-
-Focusable anchor
-
-Result
-
-PASS
-PASS
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.checksum
index e7afb87..cb6a0cc 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.checksum
@@ -1 +1 @@
-57c2a8f8b62e93881f122a1b01fb5c22 \ No newline at end of file
+34920c34cab83cdc7b1f30d6bef22357 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.png
index 387d937..969d55d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-in-float-hit-testing-expected.png
Binary files differ
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 1a12996..cc6b0b7 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3143,12 +3143,7 @@ BUG26291 MAC : LayoutTests/fast/text/drawBidiText.html = IMAGE
BUG26291 MAC : LayoutTests/transforms/2d/hindi-rotated.html = IMAGE
// WebKit roll 50313:50324
-BUG_ROLANDSTEINER MAC LINUX : LayoutTests/fast/block/float/float-in-float-hit-testing.html = IMAGE
-BUG_ROLANDSTEINER LINUX : LayoutTests/fast/events/click-focus-anchor.html = TEXT
-BUG_ROLANDSTEINER MAC : LayoutTests/fast/events/click-focus-anchor.html = TEXT
BUG_ROLANDSTEINER MAC : LayoutTests/http/tests/plugins/interrupted-get-url.html = TEXT
-BUG_ROLANDSTEINER WIN : LayoutTests/fast/events/click-focus-anchor.html = TEXT
-BUG_ROLANDSTEINER WIN : LayoutTests/fast/block/float/float-in-float-hit-testing.html = IMAGE
BUG9798 WIN : LayoutTests/dom/html/level2/html/HTMLAppletElement01.html = PASS TIMEOUT
// Flaky since at least WebKit 50258.