- rebaseline image border test

- update bug numbers in test expectations

TBR=dglazkov
TEST=none
BUG=1064038

Review URL: http://codereview.chromium.org/185006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25172 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 26 insertions, 6 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/image-border-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/image-border-expected.checksum
index 37daadb..5249831 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/image-border-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/image-border-expected.checksum
@@ -1 +1 @@
-3e5800f37032e9c34998cd2238206af6
\ No newline at end of file
+d793adacf7eba149f5734b7cc9a59942
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/image-border-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/image-border-expected.png
index 17a1b6c..222dc05 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/image-border-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/image-border-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/image-border-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/image-border-expected.checksum
new file mode 100644
index 0000000..7af8edb1
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/image-border-expected.checksum
@@ -0,0 +1 @@
+bb12039c12b75b065b4bc8b1a4aab485
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/image-border-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/image-border-expected.png
new file mode 100644
index 0000000..48568a6
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/image-border-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/image-border-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/image-border-expected.txt
new file mode 100644
index 0000000..e5a81f1
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/image-border-expected.txt
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x40
+        RenderText {#text} at (0,0) size 766x39
+          text run at (0,0) width 495: "The first empty image box below should have the default grey \"no border\" border. "
+          text run at (495,0) width 271: "The second should have a 1-pixel solid black"
+          text run at (0,20) width 264: "border. They should be the same otherwise."
+      RenderBlock (anonymous) at (0,56) size 784x55
+        RenderText {#text} at (0,35) size 52x19
+          text run at (0,35) width 52: "border:0"
+        RenderImage {IMG} at (52,0) size 338x50
+      RenderBlock {HR} at (0,119) size 784x2 [border: (1px inset #000000)]
+      RenderBlock (anonymous) at (0,129) size 784x57
+        RenderText {#text} at (0,37) size 52x19
+          text run at (0,37) width 52: "border:1"
+        RenderImage {IMG} at (52,0) size 340x52 [border: (1px solid #000000)]
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 5b087dd..2f6cc38 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -492,10 +492,7 @@ BUG20566 : LayoutTests/fast/invalid/residual-style.html = FAIL
 
 // Vertical scrollbar created when there is no overflow.
 // See also https://bugs.webkit.org/show_bug.cgi?id=24434 .
-BUG1055396 LINUX WIN : LayoutTests/fast/forms/textarea-scrollbar-height.html = FAIL
-
-// Image with border="1" drawn without the border.
-BUG1064038 LINUX WIN : LayoutTests/fast/forms/image-border.html = FAIL
+BUG20826 LINUX WIN : LayoutTests/fast/forms/textarea-scrollbar-height.html = FAIL
 
 // Pixeltest failure: Form control metrics incorrect
 BUG10273 LINUX : LayoutTests/http/tests/navigation/javascriptlink-frames.html = FAIL PASS
@@ -503,7 +500,7 @@ BUG10273 LINUX : LayoutTests/http/tests/navigation/javascriptlink-frames.html =
 // Mac Safari under certain circumstances automatically places
 // a caret in editable document even when none was requested programatically.
 // We don't intend to copy this feature (at least not for Beta).
-BUG742182 BUG845388 LINUX WIN : LayoutTests/editing/selection/designmode-no-caret.html = FAIL
+BUG20844 LINUX WIN : LayoutTests/editing/selection/designmode-no-caret.html = FAIL
 
 // The end result looks right, but the event messages differ.
 BUG845400 LINUX WIN : LayoutTests/editing/pasteboard/paste-xml.xhtml = FAIL