summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-21 17:04:40 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-21 17:04:40 +0000
commitf1f73abc4122e51c7c3c74f58c9f62d43cdc7171 (patch)
treec0d0f37caa2837e05054fa2dbfdc745a7926ac16 /webkit
parent9284f2966beccfd017f3f85809375508412fe0e2 (diff)
downloadchromium_src-f1f73abc4122e51c7c3c74f58c9f62d43cdc7171.zip
chromium_src-f1f73abc4122e51c7c3c74f58c9f62d43cdc7171.tar.gz
chromium_src-f1f73abc4122e51c7c3c74f58c9f62d43cdc7171.tar.bz2
Rebaseline tests whose results changed due to http://trac.webkit.org/changeset/47229
Also, add some bugs number for a layout tests. BUG=None TEST=None (These are the tests.) Review URL: http://codereview.chromium.org/212023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.pngbin28679 -> 29128 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/monospace-width-cache-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/monospace-width-cache-expected.pngbin15243 -> 15244 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.pngbin9514 -> 9602 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.txt14
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/monospace-width-cache-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/monospace-width-cache-expected.pngbin5984 -> 5985 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/monospace-width-cache-expected.txt8
-rwxr-xr-xwebkit/tools/layout_tests/test_expectations.txt9
11 files changed, 17 insertions, 22 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.checksum
index 920bac1..d0c870e 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.checksum
@@ -1 +1 @@
-62276bb5e79b6ffd3f4c8d01555e8686 \ No newline at end of file
+6f7c138b79d7a7910050c8d0a1f9ced4 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.png
index 8ca09f75..9f8eaaf 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/monospace-width-cache-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/monospace-width-cache-expected.checksum
index 762e314..b074911 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/monospace-width-cache-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/monospace-width-cache-expected.checksum
@@ -1 +1 @@
-9266bb12e4778ffa9ed86fb6d092cc19 \ No newline at end of file
+105225199314ebe36308014362a93884 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/monospace-width-cache-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/monospace-width-cache-expected.png
index 2f4aba5..260a5fb 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/monospace-width-cache-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/monospace-width-cache-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.checksum
index 75ac150..6059717 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.checksum
@@ -1 +1 @@
-e18eeb1d791687cb90718e08eb5df24a \ No newline at end of file
+f38f47943ca50e170add60e492e30c7f \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.png
index f9b66c5..0a8f8f6 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.txt
index e9313058..72a5210 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.txt
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x283
- RenderBlock {HTML} at (0,0) size 800x283
- RenderBody {BODY} at (8,8) size 784x267
+layer at (0,0) size 800x285
+ RenderBlock {HTML} at (0,0) size 800x285
+ RenderBody {BODY} at (8,8) size 784x269
RenderBlock {DIV} at (0,0) size 784x118
RenderBlock {P} at (0,0) size 784x20 [color=#000080]
RenderText {#text} at (0,0) size 228x19
@@ -25,10 +25,10 @@ layer at (0,0) size 800x283
RenderBlock {P} at (0,118) size 784x19 [color=#000080]
RenderText {#text} at (0,0) size 301x18
text run at (0,0) width 301: "This sentence should be in a sans-serif font."
- RenderBlock {P} at (0,137) size 784x16 [color=#000080]
- RenderText {#text} at (0,0) size 352x16
- text run at (0,0) width 352: "This sentence should be in a monospace font."
- RenderBlock {DIV} at (0,153) size 784x114
+ RenderBlock {P} at (0,137) size 784x18 [color=#000080]
+ RenderText {#text} at (0,0) size 440x18
+ text run at (0,0) width 440: "This sentence should be in a monospace font."
+ RenderBlock {DIV} at (0,155) size 784x114
RenderBlock {P} at (0,0) size 784x16 [color=#000080]
RenderText {#text} at (0,0) size 352x16
text run at (0,0) width 352: "This sentence should be in a monospace font."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/monospace-width-cache-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/monospace-width-cache-expected.checksum
index 6a9d4d6..2d4ee10 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/monospace-width-cache-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/monospace-width-cache-expected.checksum
@@ -1 +1 @@
-af8cfd930f6216947d6454f02adcc838 \ No newline at end of file
+f32562574a0a1ec2aa4ac23eb7d4c719 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/monospace-width-cache-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/monospace-width-cache-expected.png
index d0fac5c..a9f13f1 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/monospace-width-cache-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/monospace-width-cache-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/monospace-width-cache-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/monospace-width-cache-expected.txt
index 354f646..01ecf00 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/monospace-width-cache-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/monospace-width-cache-expected.txt
@@ -20,7 +20,7 @@ layer at (0,0) size 800x600
RenderBlock {P} at (0,56) size 784x20
RenderText {#text} at (0,0) size 347x19
text run at (0,0) width 347: "The blue line and the black line should be the same length."
- RenderBlock {P} at (0,92) size 784x16
- RenderInline {SPAN} at (0,0) size 96x17 [border: (1px solid #0000FF) none]
- RenderText {#text} at (0,0) size 96x16
- text run at (0,0) width 96: "\x{2500}\x{2500}\x{2500}\x{2500}\x{2500}\x{2500}\x{2500}\x{2500}\x{2500}\x{2500}\x{2500}\x{2500}"
+ RenderBlock {P} at (0,92) size 784x18
+ RenderInline {SPAN} at (0,0) size 120x19 [border: (1px solid #0000FF) none]
+ RenderText {#text} at (0,0) size 120x18
+ text run at (0,0) width 120: "\x{2500}\x{2500}\x{2500}\x{2500}\x{2500}\x{2500}\x{2500}\x{2500}\x{2500}\x{2500}\x{2500}\x{2500}"
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index a7129da..2cd6d74 100755
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2191,16 +2191,11 @@ BUG18939 : LayoutTests/fast/js/prototypes.html = FAIL
// Fallout from webkit 47041:47189
BUG19248 : LayoutTests/fast/js/const.html = FAIL
+BUG22296 : LayoutTests/storage/multiple-transactions-on-different-handles.html = TIMEOUT
+BUG22299 : LayoutTests/fast/dom/Window/window-property-shadowing.html = FAIL
-BUG_LEVIN : LayoutTests/fast/dom/Window/window-property-shadowing.html = FAIL
-BUG_LEVIN : LayoutTests/storage/multiple-transactions-on-different-handles.html = TIMEOUT
BUG_LEVIN WIN : LayoutTests/fast/events/mouse-click-events.html = FAIL
-// Fallout from webkit 47189:47265
-BUG_LEVIN WIN LINUX : LayoutTests/css2.1/t1503-c522-font-family-00-b.html = FAIL
-//BUG_LEVIN WIN LINUX : LayoutTests/fast/reflections/reflection-overflow-scroll.html = FAIL
-BUG_LEVIN WIN LINUX : LayoutTests/fast/text/monospace-width-cache.html = FAIL
-
// Fallout from webkit 47265:47277
BUG_MBELSHE : LayoutTests/fast/js/Array-isArray.html = FAIL