summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-25 19:45:51 +0000
committerjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-25 19:45:51 +0000
commitc741d481a8f1491fd8153988431bbabee047a466 (patch)
tree960a20905c3bb49e7f6fed2ab251ec7719d6d0d0
parent25d8ea2312ddb0d7b5a28dd6b35dea377dc37983 (diff)
downloadchromium_src-c741d481a8f1491fd8153988431bbabee047a466.zip
chromium_src-c741d481a8f1491fd8153988431bbabee047a466.tar.gz
chromium_src-c741d481a8f1491fd8153988431bbabee047a466.tar.bz2
Rebaseline LayoutTests/editing/execCommand/5482023.html. Started failing with webkit merge 44969:45017 because it Was rebaselined upstream in webkit http://trac.webkit.org/changeset/45016.
BUG=15132 TEST=Ran on layout test try servers. Review URL: http://codereview.chromium.org/173322 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24278 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5482023-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5482023-expected.pngbin17478 -> 17475 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5482023-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5482023-expected.pngbin6409 -> 6408 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5482023-expected.txt7
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt1
6 files changed, 6 insertions, 6 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5482023-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5482023-expected.checksum
index 2af72b61..e02a266 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5482023-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5482023-expected.checksum
@@ -1 +1 @@
-ec0efbf4a1b4173b7b4179f73d02a3e1 \ No newline at end of file
+7e596904d1cc827c5cca58f140e5a7a0 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5482023-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5482023-expected.png
index ff2a92f..f28e2f9 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5482023-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/5482023-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5482023-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5482023-expected.checksum
index d51b991..457dd8b 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5482023-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5482023-expected.checksum
@@ -1 +1 @@
-5a84592acc7759e753c51188bb28fa8d \ No newline at end of file
+b010c61796affc8a255ae5496b22e4a1 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5482023-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5482023-expected.png
index da74939..cb660a6 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5482023-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5482023-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5482023-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5482023-expected.txt
index 3e1fe05..aa71bcf93 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5482023-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/5482023-expected.txt
@@ -4,10 +4,11 @@ layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x571
RenderBlock {H1} at (0,0) size 784x111
- RenderText {#text} at (0,0) size 784x110
+ RenderText {#text} at (0,0) size 778x110
text run at (0,0) width 723: "This tests for a bug when performing a FormatBlock"
text run at (723,0) width 8: " "
- text run at (0,37) width 778: "inside a body with no visible content. This text should be"
- text run at (778,37) width 6: " "
+ text run at (0,37) width 511: "inside a body with no visible content. "
+ text run at (511,37) width 259: "This text should be"
+ text run at (770,37) width 8: " "
text run at (0,74) width 287: "inside an h1 element."
caret: position 132 of child 0 {#text} of child 0 {H1} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 1089864..b883a12 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2405,7 +2405,6 @@ BUG14885 : LayoutTests/fast/js/JSON-parse.html = FAIL
BUG14946 : LayoutTests/fast/js/date-toisostring.html = FAIL
// WebKit 44969:45017
-BUG15132 WIN LINUX : LayoutTests/editing/execCommand/5482023.html = FAIL
BUG15132 WIN : LayoutTests/media/event-attributes.html = FAIL
// The Mac layout test buildbots haven't generated a package for 20 days so