Remove a layout-test-only font-fallback path.

The net impact is that "times new roman" is fallen back to instead of "Times" for a couple of layout tests.
Overall this affects 9 tests. 6 have been rebased, and 3 marked as expected fail (since am uncertain of their correctness).

This also removes some dead code relating to IMLangFontLink.

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

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

14 files changed, 16 insertions, 58 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/19089-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/19089-expected.txt
new file mode 100644
index 0000000..734ab86
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/19089-expected.txt
@@ -0,0 +1,2 @@
+This tests to make sure an ASSERT doesn't fire when performing a FormatBlock operation on a selection that ends just after a horizontal rule that is the last element in the document. The test should not assert.
+<pre><span class="Apple-style-span" style="font-family: 'times new roman'; font-size: 16px; white-space: normal; "><hr></span></pre>
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/047-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/047-expected.checksum
index 9d7467f..ef072f8 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/047-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/047-expected.checksum
@@ -1 +1 @@
-d19992b6f4944259773787b8fad7af69
\ No newline at end of file
+97e1e09c9eb2b80dcad143cc5daf2873
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/047-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/047-expected.png
index 30420ce..04dc7c4 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/047-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/047-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/047-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/047-expected.txt
index ec9de05..082be33 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/047-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/047-expected.txt
@@ -55,6 +55,6 @@ layer at (8,8) size 512x868
 layer at (546,179) size 200x49
   RenderBlock (positioned) {SPAN} at (538,171) size 200x48
     RenderText {#text} at (0,-1) size 196x50
-      text run at (0,-1) width 190: "\x{2190} this should be to the right of"
+      text run at (0,-1) width 191: "\x{2190} this should be to the right of"
       text run at (0,15) width 196: "the paragraph, lining up with the"
       text run at (0,31) width 42: "dagger"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/computed-style-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/computed-style-expected.txt
index 1e6632e..44584e0 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/computed-style-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/computed-style-expected.txt
@@ -27,7 +27,7 @@ direction: ltr;
 display: block;

 empty-cells: show;

 float: none;

-font-family: Times;

+font-family: 'times new roman';

 font-size: 16px;

 font-style: normal;

 font-variant: normal;

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/computed-style-without-renderer-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/computed-style-without-renderer-expected.txt
index e38ec73..f35d4a0 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/computed-style-without-renderer-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/computed-style-without-renderer-expected.txt
@@ -26,7 +26,7 @@ Computed style of an element whose parent's 'display' value is 'none':
     display: block

     empty-cells: show

     float: none

-    font-family: Times

+    font-family: 'times new roman'

     font-size: 16px

     font-style: normal

     font-variant: normal

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/cg-fallback-bolding-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/cg-fallback-bolding-expected.checksum
index 319d5d6..f8cc1f4 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/cg-fallback-bolding-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/cg-fallback-bolding-expected.checksum
@@ -1 +1 @@
-7cdbfa15d71df5634043d14d4dea51e3
\ No newline at end of file
+6e98a4b0e63b09deb481ed876e0924ce
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/cg-fallback-bolding-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/cg-fallback-bolding-expected.png
index ac53dbb..f9e19f7 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/cg-fallback-bolding-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/cg-fallback-bolding-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/cg-fallback-bolding-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/cg-fallback-bolding-expected.txt
index 999bb3f..0ed9cad 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/cg-fallback-bolding-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/cg-fallback-bolding-expected.txt
@@ -13,5 +13,5 @@ layer at (0,0) size 800x600
           text run at (35,40) width 749: "This test is making sure we don't make incorrect assumptions based off the fact that we would have to synthesize bold for the"
           text run at (0,60) width 109: "first font in the list."
       RenderBlock {P} at (0,208) size 784x128
-        RenderText {#text} at (0,0) size 71x128
-          text run at (0,0) width 71 RTL: "\x{5D0}"
+        RenderText {#text} at (0,0) size 67x128
+          text run at (0,0) width 67 RTL: "\x{5D0}"
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index a5bc0fe..841be36 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -89,44 +89,6 @@ void EnableWebCoreNotImplementedLogging() {
   WebCore::LogNotYetImplemented.state = WTFLogChannelOn;
 }
 
-#if defined(OS_WIN)
-IMLangFontLink2* GetLangFontLinkHelper() {
-  // TODO(hbono): http://b/1072298 Experimentally disabled this code to
-  // prevent registry leaks caused by this IMLangFontLink2 interface.
-  // If you find any font-rendering regressions. Please feel free to blame me.
-  // TODO(hbono): http://b/1072298 The test shell does not use our font metrics
-  // but it uses its own font metrics which heavily depend on this
-  // IMLangFontLink2 interface. Even though we should change the test shell to
-  // use out font metrics and re-baseline such tests, we temporarily let the
-  // test shell use this interface until we complete the said change.
-  if (!IsLayoutTestMode())
-    return NULL;
-
-  static IMultiLanguage *multi_language = NULL;
-
-  if (!multi_language) {
-    if (CoCreateInstance(CLSID_CMultiLanguage, 
-                         0, 
-                         CLSCTX_ALL, 
-                         IID_IMultiLanguage, 
-                         reinterpret_cast<void**>(&multi_language)) != S_OK) {
-        return 0;
-    }
-  }
-
-  static IMLangFontLink2* lang_font_link;
-  if (!lang_font_link) {
-    if (multi_language->QueryInterface(
-            IID_IMLangFontLink2, 
-            reinterpret_cast<void**>(&lang_font_link)) != S_OK) {
-      return 0;
-    }
-  }
-
-  return lang_font_link;
-}
-#endif  // defined(OS_WIN)
-
 std::wstring DumpDocumentText(WebFrame* web_frame) {
   WebFrameImpl* webFrameImpl = static_cast<WebFrameImpl*>(web_frame);
   WebCore::Frame* frame = webFrameImpl->frame();
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
index 1c70917..8b311cb 100644
--- a/webkit/glue/webkit_glue.h
+++ b/webkit/glue/webkit_glue.h
@@ -72,13 +72,6 @@ void InitializeForTesting();
 // Turn on the logging for notImplemented() calls from WebCore.
 void EnableWebCoreNotImplementedLogging();
 
-#if defined(OS_WIN)
-// Returns the com object pointer for the FontLink interface. This is the
-// default way to do this operation. It can be called directly from
-// GetLangFontLink.
-IMLangFontLink2* GetLangFontLinkHelper();
-#endif
-
 // Returns screen information corresponding to the given window.  This is the
 // default implementation.
 ScreenInfo GetScreenInfoHelper(gfx::ViewHandle window);
diff --git a/webkit/port/platform/graphics/FontCacheWin.cpp b/webkit/port/platform/graphics/FontCacheWin.cpp
index 5bb808e..2f09499 100644
--- a/webkit/port/platform/graphics/FontCacheWin.cpp
+++ b/webkit/port/platform/graphics/FontCacheWin.cpp
@@ -513,8 +513,6 @@ static LONG toGDIFontWeight(FontWeight fontWeight)
 // TODO in pending/FontCache.h.
 AtomicString FontCache::getGenericFontForScript(UScriptCode script, const FontDescription& description)
 {
-    if (ChromiumBridge::layoutTestMode() && script == USCRIPT_LATIN)
-        return emptyAtom;
     FontDescription::GenericFamilyType generic = description.genericFamily();
     const wchar_t* scriptFont = GetFontFamilyForScript(
         script, static_cast<GenericFamilyType>(generic));
diff --git a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
index 039914d..2fb39f4 100644
--- a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
@@ -308,6 +308,13 @@ LayoutTests/fast/js/kde/function_arguments.html = FAIL
 // error in the header of the following test.
 SKIP : LayoutTests/fast/css/disabled-author-styles.html = FAIL
 
+// Failed with change http://codereview.chromium.org/12457 which changes
+// the fallback font to "times new roman" from "Times". Need to
+// verify if the current behavior is still correct.
+LayoutTests/fast/css/font-family-initial.html = FAIL
+LayoutTests/fast/css/font-face-default-font.html = FAIL
+LayoutTests/editing/pasteboard/drag-drop-dead-frame.html = FAIL
+
 // ------------------------------------------------------------------------- //
 
 // Bug: 924387, 1058654
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 5b41439..f5a25e7 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -741,10 +741,6 @@ void TestShell::ShowStartupDebuggingDialog() {
 
 namespace webkit_glue {
 
-IMLangFontLink2* GetLangFontLink() {
-  return webkit_glue::GetLangFontLinkHelper();
-}
-
 std::wstring GetLocalizedString(int message_id) {
   const ATLSTRINGRESOURCEIMAGE* image =
       AtlGetStringResourceImage(_AtlBaseModule.GetModuleInstance(),