Enable subpixel positioning for UI

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"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/statistics_recorder.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/browser_shutdown_profile_dumper.h"
 #include "content/browser/notification_service_impl.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "ui/base/ime/input_method_initializer.h"
 
 #if defined(OS_WIN)
-#include <dwrite.h>
-#include "base/win/scoped_comptr.h"
 #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 67 matching lines @@
   }
 
   DWORD dummy = 0;
   CHECK(::VirtualProtect(cert_verify_signature_ptr, 5, old_protect, &dummy));
   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::kDisableDirectWriteForUI) &&
-      !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.
-    CHECK(dwrite_create_factory_proc);
-
-    base::win::ScopedComPtr<IDWriteFactory> factory;
-
-    CHECK(SUCCEEDED(
-        dwrite_create_factory_proc(
-            DWRITE_FACTORY_TYPE_SHARED,
-          __uuidof(IDWriteFactory),
-          reinterpret_cast<IUnknown**>(factory.Receive()))));
-    // The skia call to create a new DirectWrite font manager instance can fail
-    // if we are unable to get the system font collection from the DirectWrite
-    // factory. The GetSystemFontCollection method in the IDWriteFactory
-    // interface fails with E_INVALIDARG on certain Windows 7 gold versions
-    // (6.1.7600.*). We should just use GDI in these cases.
-    SkFontMgr* direct_write_font_mgr = SkFontMgr_New_DirectWrite(factory.get());
-    if (direct_write_font_mgr) {
-      SetDefaultSkiaFactory(direct_write_font_mgr);
-      gfx::PlatformFontWin::SetDirectWriteFactory(factory.get());
-    }
-  }
-}
-
 }  // namespace
 
 #endif  // OS_WIN
 
 class BrowserMainRunnerImpl : public BrowserMainRunner {
  public:
   BrowserMainRunnerImpl()
       : initialization_started_(false), is_shutdown_(false) {}
 
   ~BrowserMainRunnerImpl() override {
@@ skipping 33 matching lines @@
       base::StatisticsRecorder::Initialize();
 
       notification_service_.reset(new NotificationServiceImpl);
 
 #if defined(OS_WIN)
       // Ole must be initialized before starting message pump, so that TSF
       // (Text Services Framework) module can interact with the message pump
       // on Windows 8 Metro mode.
       ole_initializer_.reset(new ui::ScopedOleInitializer);
       // Enable DirectWrite font rendering if needed.
-      MaybeEnableDirectWriteFontRendering();
+      gfx::win::MaybeInitializeDirectWrite();
 #endif  // OS_WIN
 
       main_loop_.reset(new BrowserMainLoop(parameters));
 
       main_loop_->Init();
 
       main_loop_->EarlyInitialization();
 
       // Must happen before we try to use a message loop or display any UI.
       if (!main_loop_->InitializeToolkit())
@@ skipping 107 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainRunnerImpl);
 };
 
 // static
 BrowserMainRunner* BrowserMainRunner::Create() {
   return new BrowserMainRunnerImpl();
 }
 
 }  // namespace content