| Index: ui/gfx/win/direct_write.cc
|
| diff --git a/ui/gfx/win/direct_write.cc b/ui/gfx/win/direct_write.cc
|
| index 90fd728d6beef8ef885b4472a5b0268aecb8e06b..bf30f64cc30a7bb990224ba145c282f3cd3f85b0 100644
|
| --- a/ui/gfx/win/direct_write.cc
|
| +++ b/ui/gfx/win/direct_write.cc
|
| @@ -18,23 +18,13 @@ namespace gfx {
|
| namespace win {
|
|
|
| void CreateDWriteFactory(IDWriteFactory** factory) {
|
| - using DWriteCreateFactoryProc = decltype(DWriteCreateFactory)*;
|
| - 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)
|
| - return;
|
| -
|
| - // Failure to create the DirectWrite factory indicates a corrupt dll.
|
| base::win::ScopedComPtr<IUnknown> factory_unknown;
|
| - if (FAILED(dwrite_create_factory_proc(DWRITE_FACTORY_TYPE_SHARED,
|
| - __uuidof(IDWriteFactory),
|
| - factory_unknown.Receive()))) {
|
| + HRESULT hr =
|
| + DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory),
|
| + factory_unknown.Receive());
|
| + if (FAILED(hr)) {
|
| + base::debug::Alias(&hr);
|
| + CHECK(false);
|
| return;
|
| }
|
| factory_unknown.QueryInterface<IDWriteFactory>(factory);
|
|
|