Reland of Link to DirectWrite directly, instead of calling LoadLibrary

ui/gfx/font_fallback_win.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 "ui/gfx/font_fallback_win.h"
 
 #include <dwrite_2.h>
 #include <usp10.h>
 #include <wrl.h>
 
@@ skipping 13 matching lines @@
 #include "ui/gfx/font.h"
 #include "ui/gfx/font_fallback.h"
 #include "ui/gfx/platform_font_win.h"
 #include "ui/gfx/win/direct_write.h"
 #include "ui/gfx/win/text_analysis_source.h"
 
 namespace gfx {
 
 namespace {
 
-IDWriteFactory* g_factory = nullptr;
-
 // Queries the registry to get a mapping from font filenames to font names.
 void QueryFontsFromRegistry(std::map<std::string, std::string>* map) {
   const wchar_t* kFonts =
       L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts";
 
   base::win::RegistryValueIterator it(HKEY_LOCAL_MACHINE, kFonts);
   for (; it.Valid(); ++it) {
     const std::string filename =
         base::ToLowerASCII(base::WideToUTF8(it.Value()));
     (*map)[filename] = base::WideToUTF8(it.Name());
@@ skipping 305 matching lines @@
   // renderer this can cause hangs. Code that needs font fallback in the
   // renderer should instead use the font proxy.
   DCHECK(base::MessageLoopForUI::IsCurrent());
 
   // Check that we have at least as much text as was claimed. If we have less
   // text than expected then DirectWrite will become confused and crash. This
   // shouldn't happen, but crbug.com/624905 shows that it happens sometimes.
   DCHECK_GE(wcslen(text), static_cast<size_t>(text_length));
   text_length = std::min(wcslen(text), static_cast<size_t>(text_length));
 
-  if (g_factory == nullptr) {
-    gfx::win::CreateDWriteFactory(&g_factory);
-  }
+  base::win::ScopedComPtr<IDWriteFactory> factory;
+  gfx::win::CreateDWriteFactory(factory.Receive());
   base::win::ScopedComPtr<IDWriteFactory2> factory2;
-  g_factory->QueryInterface(factory2.Receive());
+  factory.QueryInterface(factory2.Receive());
   if (!factory2) {
     // IDWriteFactory2 is not available before Win8.1
     return GetUniscribeFallbackFont(font, text, text_length, result);
   }
 
   base::win::ScopedComPtr<IDWriteFontFallback> fallback;
   if (FAILED(factory2->GetSystemFontFallback(fallback.Receive())))
     return false;
 
   base::string16 locale = base::UTF8ToUTF16(base::i18n::GetConfiguredLocale());
@@ skipping 33 matching lines @@
     base::string16 name;
     if (FAILED(GetFamilyNameFromDirectWriteFont(mapped_font.get(), &name)))
       return false;
     *result = Font(base::UTF16ToUTF8(name), font.GetFontSize() * scale);
     return true;
   }
   return false;
 }
 
 }  // namespace gfx