Rebaseline 3 tests for Windows Vista.

* LayoutTests/fast/forms/search-styled.html
  TEXTMETRIC::tmAveCharWidth for `Verdana' font returns different
  results in Windows XP and Vista, and the size of a text form field
  depends on it.

* LayoutTests/fast/text/whitespace/026.html and basic/006.html
  These tests use U+00B7.  The width of U+00B7 in `Times New Roman'
  font is 3 pixels in Windows XP, and 5 pixels in Windows Vista.

BUG=21859
TEST=none
Review URL: http://codereview.chromium.org/327012

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

18 files changed, 65 insertions, 17 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/forms/search-styled-expected.checksum b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/forms/search-styled-expected.checksum
new file mode 100644
index 0000000..998d448
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/forms/search-styled-expected.checksum
@@ -0,0 +1 @@
+24c67da8d9c97a5400b19c8793f5b410
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/forms/search-styled-expected.png b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/forms/search-styled-expected.png
new file mode 100644
index 0000000..c77fdb1
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/forms/search-styled-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/forms/search-styled-expected.txt b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/forms/search-styled-expected.txt
new file mode 100644
index 0000000..3517785
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/forms/search-styled-expected.txt
@@ -0,0 +1,16 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x41
+  RenderBlock {HTML} at (0,0) size 800x41
+    RenderBody {BODY} at (8,8) size 784x25
+      RenderTextControl {INPUT} at (2,2) size 140x21 [bgcolor=#FFFFFF] [border: (1px solid #BDC7D8)]
+        RenderBlock {DIV} at (18,4) size 118x13
+          RenderBlock {DIV} at (2,0) size 15x11
+          RenderBlock {DIV} at (107,3) size 8x8
+      RenderText {#text} at (0,0) size 0x0
+      RenderText {#text} at (0,0) size 0x0
+      RenderText {#text} at (0,0) size 0x0
+layer at (48,14) size 87x13 scrollWidth 88
+  RenderBlock {DIV} at (20,0) size 87x13 [color=#A9A9A9]
+    RenderText {#text} at (1,0) size 86x13
+      text run at (1,0) width 86: "Search for Events"
diff --git a/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/text/basic/006-expected.checksum b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/text/basic/006-expected.checksum
new file mode 100644
index 0000000..18f7d54
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/text/basic/006-expected.checksum
@@ -0,0 +1 @@
+13b11f1ea731350c3ffece95ca0fa9d8
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/text/basic/006-expected.png b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/text/basic/006-expected.png
new file mode 100644
index 0000000..74604be
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/text/basic/006-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/text/basic/006-expected.txt b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/text/basic/006-expected.txt
new file mode 100644
index 0000000..8123e71
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/text/basic/006-expected.txt
@@ -0,0 +1,14 @@
+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
+      RenderTable {TABLE} at (0,0) size 784x32 [border: (2px outset #808080)]
+        RenderTableSection {TBODY} at (2,2) size 780x28
+          RenderTableRow {TR} at (0,2) size 780x24
+            RenderTableCell {TD} at (2,2) size 585x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 148x19
+                text run at (2,2) width 148: "Big cell gets all the width"
+            RenderTableCell {TD} at (589,2) size 189x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 185x19
+                text run at (2,2) width 185: "Icannotbreak noicannot \x{B7}break"
diff --git a/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/text/whitespace/026-expected.checksum b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/text/whitespace/026-expected.checksum
new file mode 100644
index 0000000..a635dec
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/text/whitespace/026-expected.checksum
@@ -0,0 +1 @@
+388f87d0d9bf7ac53b4cfd86d1490423
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/text/whitespace/026-expected.png b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/text/whitespace/026-expected.png
new file mode 100644
index 0000000..d74fa57
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/text/whitespace/026-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/text/whitespace/026-expected.txt b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/text/whitespace/026-expected.txt
new file mode 100644
index 0000000..71da286
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/text/whitespace/026-expected.txt
@@ -0,0 +1,15 @@
+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
+      RenderTable {TABLE} at (0,0) size 784x20
+        RenderTableSection {TBODY} at (0,0) size 784x20
+          RenderTableRow {TR} at (0,0) size 784x20
+            RenderTableCell {TD} at (0,0) size 3x20 [r=0 c=0 rs=1 cs=1]
+              RenderInline {B} at (0,0) size 3x19
+                RenderText {#text} at (0,0) size 3x19
+                  text run at (0,0) width 3: "\x{B7}"
+            RenderTableCell {TD} at (3,0) size 781x20 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (0,0) size 369x19
+                text run at (0,0) width 369: "There should be space between the bullet and this line of text."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-styled-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-styled-expected.checksum
index 998d448..7f59e72 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-styled-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-styled-expected.checksum
@@ -1 +1 @@
-24c67da8d9c97a5400b19c8793f5b410
\ No newline at end of file
+53b9ae6a0f78ab0b702bb8ec7fae4611
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-styled-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-styled-expected.png
index c77fdb1..5b0b08b 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-styled-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-styled-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-styled-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-styled-expected.txt
index 3517785..ee37be4 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-styled-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-styled-expected.txt
@@ -3,14 +3,14 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x41
   RenderBlock {HTML} at (0,0) size 800x41
     RenderBody {BODY} at (8,8) size 784x25
-      RenderTextControl {INPUT} at (2,2) size 140x21 [bgcolor=#FFFFFF] [border: (1px solid #BDC7D8)]
-        RenderBlock {DIV} at (18,4) size 118x13
+      RenderTextControl {INPUT} at (2,2) size 142x21 [bgcolor=#FFFFFF] [border: (1px solid #BDC7D8)]
+        RenderBlock {DIV} at (18,4) size 120x13
           RenderBlock {DIV} at (2,0) size 15x11
-          RenderBlock {DIV} at (107,3) size 8x8
+          RenderBlock {DIV} at (109,3) size 8x8
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
-layer at (48,14) size 87x13 scrollWidth 88
-  RenderBlock {DIV} at (20,0) size 87x13 [color=#A9A9A9]
+layer at (48,14) size 89x13
+  RenderBlock {DIV} at (20,0) size 89x13 [color=#A9A9A9]
     RenderText {#text} at (1,0) size 86x13
       text run at (1,0) width 86: "Search for Events"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.checksum
index 18f7d54..70ac026 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.checksum
@@ -1 +1 @@
-13b11f1ea731350c3ffece95ca0fa9d8
\ No newline at end of file
+209cb1a26f14576ba6f7165539a994fb
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.png
index 74604be..8458220 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.txt
index 8123e71..96fa28c 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.txt
@@ -6,9 +6,9 @@ layer at (0,0) size 800x600
       RenderTable {TABLE} at (0,0) size 784x32 [border: (2px outset #808080)]
         RenderTableSection {TBODY} at (2,2) size 780x28
           RenderTableRow {TR} at (0,2) size 780x24
-            RenderTableCell {TD} at (2,2) size 585x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (2,2) size 584x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (2,2) size 148x19
                 text run at (2,2) width 148: "Big cell gets all the width"
-            RenderTableCell {TD} at (589,2) size 189x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 185x19
-                text run at (2,2) width 185: "Icannotbreak noicannot \x{B7}break"
+            RenderTableCell {TD} at (588,2) size 190x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 186x19
+                text run at (2,2) width 186: "Icannotbreak noicannot \x{B7}break"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/026-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/026-expected.checksum
index a635dec..8e0addd 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/026-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/026-expected.checksum
@@ -1 +1 @@
-388f87d0d9bf7ac53b4cfd86d1490423
\ No newline at end of file
+289433a34a8895a73ea2051a3c4be93e
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/026-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/026-expected.png
index d74fa57..24b4da5 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/026-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/026-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/026-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/026-expected.txt
index 71da286..5fa9427 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/026-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/whitespace/026-expected.txt
@@ -6,10 +6,10 @@ layer at (0,0) size 800x600
       RenderTable {TABLE} at (0,0) size 784x20
         RenderTableSection {TBODY} at (0,0) size 784x20
           RenderTableRow {TR} at (0,0) size 784x20
-            RenderTableCell {TD} at (0,0) size 3x20 [r=0 c=0 rs=1 cs=1]
-              RenderInline {B} at (0,0) size 3x19
-                RenderText {#text} at (0,0) size 3x19
-                  text run at (0,0) width 3: "\x{B7}"
-            RenderTableCell {TD} at (3,0) size 781x20 [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (0,0) size 5x20 [r=0 c=0 rs=1 cs=1]
+              RenderInline {B} at (0,0) size 5x19
+                RenderText {#text} at (0,0) size 5x19
+                  text run at (0,0) width 5: "\x{B7}"
+            RenderTableCell {TD} at (5,0) size 779x20 [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (0,0) size 369x19
                 text run at (0,0) width 369: "There should be space between the bullet and this line of text."