Index: ui/gfx/win/direct_write.cc |
diff --git a/ui/gfx/win/direct_write.cc b/ui/gfx/win/direct_write.cc |
index 058f4be01deeaf50d02e11e2682cc4882c6f6b36..66945f61128afed1b07e8811697c524834a69569 100644 |
--- a/ui/gfx/win/direct_write.cc |
+++ b/ui/gfx/win/direct_write.cc |
@@ -4,11 +4,16 @@ |
#include "ui/gfx/win/direct_write.h" |
+#include <dwrite.h> |
+ |
#include "base/basictypes.h" |
#include "base/command_line.h" |
#include "base/metrics/field_trial.h" |
#include "base/win/registry.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" |
@@ -59,5 +64,35 @@ bool ShouldUseDirectWrite() { |
return group_name != "Disabled"; |
} |
+void MaybeInitializeDirectWrite() { |
+ if (!ShouldUseDirectWrite() || |
+ CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kDisableDirectWriteForUI) && |
msw
2014/11/24 21:51:00
Should this be || to preserve the old logic?
ckocagil
2014/11/25 01:39:47
Good catch! Done.
|
+ CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kDisableHarfBuzzRenderText)) { |
+ return; |
+ } |
+ |
+ 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); |
+ |
+ IDWriteFactory* factory = NULL; |
+ |
+ CHECK(SUCCEEDED( |
+ dwrite_create_factory_proc(DWRITE_FACTORY_TYPE_SHARED, |
+ __uuidof(IDWriteFactory), |
+ reinterpret_cast<IUnknown**>(&factory)))); |
+ SetDefaultSkiaFactory(SkFontMgr_New_DirectWrite(factory)); |
+ PlatformFontWin::SetDirectWriteFactory(factory); |
+} |
+ |
} // namespace win |
} // namespace gfx |