Use the correct font metrics in base PlatformFontWin if DirectWrite is used in the browser for font…

content/browser/browser_main_runner.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/browser/browser_main_runner.h"
 
 #include "base/allocator/allocator_shim.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
@@ skipping 10 matching lines @@
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "net/cert/sha256_legacy_support_win.h"
 #include "sandbox/win/src/sidestep/preamble_patcher.h"
 #include "skia/ext/fontmgr_default_win.h"
 #include "third_party/skia/include/ports/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkTypeface_win.h"
 #include "ui/base/win/scoped_ole_initializer.h"
+#include "ui/gfx/platform_font_win.h"
 #include "ui/gfx/switches.h"
 #include "ui/gfx/win/direct_write.h"
 #endif
 
 bool g_exited_main_message_loop = false;
 
 namespace content {
 
 #if defined(OS_WIN)
 namespace {
@@ skipping 71 matching lines @@
   CHECK(::VirtualProtect(g_real_crypt_verify_signature_stub,
                          sidestep::kMaxPreambleStubSize, old_protect,
                          &old_protect));
 #endif  // _WIN64
 }
 
 void MaybeEnableDirectWriteFontRendering() {
   if (gfx::win::ShouldUseDirectWrite() &&
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableDirectWriteForUI) &&
-      CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableHarfBuzzRenderText)) {
-    SetDefaultSkiaFactory(SkFontMgr_New_DirectWrite(NULL));
+      !CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableHarfBuzzRenderText)) {
+    typedef decltype(DWriteCreateFactory)* DWriteCreateFactoryProc;
+    HMODULE dwrite_dll = LoadLibraryW(L"dwrite.dll");
+    if (!dwrite_dll)
+      return;
+
+    DWriteCreateFactoryProc dwrite_create_factory_proc =
+        reinterpret_cast<DWriteCreateFactoryProc>(
+            GetProcAddress(dwrite_dll, "DWriteCreateFactory"));
+    // Not finding the DWriteCreateFactory function indicates a corrupt dll.
+    if (!dwrite_create_factory_proc) {
+      CHECK(false);
+      return;

[scottmg, 2014/10/29 21:33:32]

no return

[ananta, 2014/10/29 21:56:18]

Done.

+    }
+
+    IDWriteFactory* factory = NULL;
+
+    CHECK(SUCCEEDED(
+        dwrite_create_factory_proc(DWRITE_FACTORY_TYPE_SHARED,
+                                   __uuidof(IDWriteFactory),
+                                   reinterpret_cast<IUnknown**>(&factory))));
+    SetDefaultSkiaFactory(SkFontMgr_New_DirectWrite(factory));
+    gfx::PlatformFontWin::set_direct_write_factory(factory);
   }
 }
 
 }  // namespace
 
 #endif  // OS_WIN
 
 class BrowserMainRunnerImpl : public BrowserMainRunner {
  public:
   BrowserMainRunnerImpl()
@@ skipping 163 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainRunnerImpl);
 };
 
 // static
 BrowserMainRunner* BrowserMainRunner::Create() {
   return new BrowserMainRunnerImpl();
 }
 
 }  // namespace content