Create direct write font proxy classes and unit tests.

ui/gfx/win/direct_write.cc

 // Copyright 2014 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/win/direct_write.h"
 
 #include <dwrite.h>

[scottmg, 2015/11/13 00:51:46]

You can remove this, now that it's in the header.

[Ilya Kulshin, 2015/11/14 00:25:34]

Done.

 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "skia/ext/fontmgr_default_win.h"
 #include "third_party/skia/include/ports/SkTypeface_win.h"
 #include "ui/gfx/platform_font_win.h"
 #include "ui/gfx/switches.h"
 #include "ui/gfx/win/dpi.h"
 
 namespace gfx {
 namespace win {
 
 namespace {
 
 static bool dwrite_enabled = false;
-
+base::win::ScopedComPtr<IDWriteFactory> factory_;

[scottmg, 2015/11/13 00:51:46]

Normally g_factory, instead of factory_.

[Ilya Kulshin, 2015/11/14 00:25:34]

Done.

 }

[scottmg, 2015/11/13 00:51:46]

Add newline before }.

[Ilya Kulshin, 2015/11/14 00:25:34]

"git cl format" insists on deleting that newline.

 
 bool ShouldUseDirectWrite() {
   // If the flag is currently on, and we're on Win7 or above, we enable
   // DirectWrite. Skia does not require the additions to DirectWrite in QFE
   // 2670838, but a simple 'better than XP' check is not enough.
   if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return false;
 
   base::win::OSInfo::VersionNumber os_version =
       base::win::OSInfo::GetInstance()->version_number();
@@ skipping 35 matching lines @@
   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)
     return;
 
-  base::win::ScopedComPtr<IDWriteFactory> factory;
-
   // Failure to create the DirectWrite factory indicates a corrupt dll.
   if (FAILED(dwrite_create_factory_proc(
-          DWRITE_FACTORY_TYPE_SHARED,
-        __uuidof(IDWriteFactory),
-        reinterpret_cast<IUnknown**>(factory.Receive()))))
+          DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory),
+          reinterpret_cast<IUnknown**>(factory_.Receive()))))
     return;
 
   // 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());
+  SkFontMgr* direct_write_font_mgr = SkFontMgr_New_DirectWrite(factory_.get());
   if (!direct_write_font_mgr)
     return;
   dwrite_enabled = true;
   SetDefaultSkiaFactory(direct_write_font_mgr);
-  gfx::PlatformFontWin::SetDirectWriteFactory(factory.get());
+  gfx::PlatformFontWin::SetDirectWriteFactory(factory_.get());
 }
 
 bool IsDirectWriteEnabled() {
   return dwrite_enabled;
 }
 
+void GetDWriteFactory(IDWriteFactory** factory) {
+  MaybeInitializeDirectWrite();
+  base::win::ScopedComPtr<IDWriteFactory> factory_ref = factory_;

[scottmg, 2015/11/13 00:51:46]

It seems like

  factory_->AddRef();
  *factory = factory_;

is what's happening and that's probably more clear.

[Ilya Kulshin, 2015/11/14 00:25:34]

Unfortunately, ScopedComPtr explicitly blocks AddRef and Release. What I
actually want is Microsoft::WRL::ComPtr::CopyTo. Which probably means I should
just use ComPtr in the first place.

+  *factory = factory_ref.Detach();
+}
+
 }  // namespace win
 }  // namespace gfx