Re-add code to load the ahem font.

We used to load the font.  Then came the font hacks from afm files
which made it no longer necessary to load the font.  The code to
load the font was removed.  Then we got rid of the font hacks and
rebaselined everything.

There are lots of updated results (hundreds), but I'm not uploading
them to rietveld.  I used grep to figure out which tests have
"ahem" in them and rebaselined them.

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

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

4 files changed, 15 insertions, 12 deletions

diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index b12fba1..760ee98 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -901,12 +901,6 @@ V8 | KJS # LayoutTests/fast/backgrounds/mask-composite.html = FAIL
 V8 | KJS # LayoutTests/fast/backgrounds/repeat/mask-negative-offset-repeat.html = FAIL
 V8 | KJS # LayoutTests/fast/block/basic/adding-near-anonymous-block.html = FAIL
 V8 | KJS # LayoutTests/fast/block/basic/min-pref-width-nowrap-floats.html = FAIL
-V8 | KJS # LayoutTests/fast/block/float/br-with-clear-2.html = FAIL
-V8 | KJS # LayoutTests/fast/block/float/br-with-clear.html = FAIL
-V8 | KJS # LayoutTests/fast/block/float/clamped-right-float.html = FAIL
-V8 | KJS # LayoutTests/fast/block/float/editable-text-overlapping-float.html = FAIL
-V8 | KJS # LayoutTests/fast/block/float/float-on-zero-height-line.html = FAIL
-V8 | KJS # LayoutTests/fast/block/float/narrow-after-wide.html = FAIL
 V8 | KJS # LayoutTests/fast/block/positioning/move-with-auto-width.html = FAIL
 V8 | KJS # LayoutTests/fast/borders/block-mask-overlay-image.html = FAIL
 V8 | KJS # LayoutTests/fast/borders/border-color-inherit.html = FAIL
@@ -978,10 +972,6 @@ V8 | KJS # LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradi
 
 
 // Post-MERGE failures: these will all need to be fixed one day
-V8 | KJS # LayoutTests/css2.1/t1002-c5523-width-01-b-g.html = FAIL
-V8 | KJS # LayoutTests/css2.1/t140201-c536-bgpos-00-b-ag.html = FAIL
-V8 | KJS # LayoutTests/css2.1/t140201-c536-bgpos-01-b-ag.html = FAIL
-V8 | KJS # LayoutTests/css2.1/t1602-c43-center-00-d-ag.html = FAIL
 V8 | KJS # LayoutTests/editing/execCommand/outdent-selection.gchtml = FAIL
 V8 | KJS # LayoutTests/editing/selection/caret-rtl-2.html = FAIL
 V8 | KJS # LayoutTests/fast/backgrounds/svg-as-background-5.html = FAIL
diff --git a/webkit/tools/test_shell/resource.h b/webkit/tools/test_shell/resource.h
index d56339e..7deb4b9 100644
--- a/webkit/tools/test_shell/resource.h
+++ b/webkit/tools/test_shell/resource.h
@@ -16,6 +16,7 @@
 #define IDI_TESTSHELL             107
 #define IDI_SMALL                 108
 #define IDC_TESTSHELL             109
+#define IDR_AHEM_FONT             113
 #define IDC_MYICON                2
 #define IDC_NAV_BACK              1001
 #define IDC_NAV_FORWARD           1002
@@ -33,6 +34,6 @@
 #define _APS_NEXT_RESOURCE_VALUE    129
 #define _APS_NEXT_COMMAND_VALUE        32771
 #define _APS_NEXT_CONTROL_VALUE        1000
-#define _APS_NEXT_SYMED_VALUE        113
+#define _APS_NEXT_SYMED_VALUE        114
 #endif
 #endif
diff --git a/webkit/tools/test_shell/resources/test_shell.rc b/webkit/tools/test_shell/resources/test_shell.rc
index a8fe86e..1366891 100644
--- a/webkit/tools/test_shell/resources/test_shell.rc
+++ b/webkit/tools/test_shell/resources/test_shell.rc
@@ -28,6 +28,9 @@ LANGUAGE 9, 1
 IDI_TESTSHELL           ICON         "test_shell.ico"
 IDI_SMALL               ICON         "small.ico"
 
+IDR_AHEM_FONT           BINDATA      "AHEM____.TTF"
+
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Menu
@@ -80,7 +83,6 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,195,6,30,11,WS_GROUP
 END
 
-
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 2415170..e2980ae 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -196,6 +196,16 @@ int main(int argc, char* argv[]) {
   InitCtrlEx.dwICC  = ICC_STANDARD_CLASSES;
   InitCommonControlsEx(&InitCtrlEx);
 
+  // Register the Ahem font used by layout tests.
+  DWORD num_fonts = 1;
+  void* font_ptr;
+  size_t font_size;
+  if (base::GetDataResourceFromModule(::GetModuleHandle(NULL), IDR_AHEM_FONT, 
+                                      &font_ptr, &font_size)) {
+    HANDLE rc = AddFontMemResourceEx(font_ptr, font_size, 0, &num_fonts);
+    DCHECK(rc != 0);
+  }
+
   bool interactive = !layout_test_mode;
   TestShell::InitializeTestShell(interactive);