OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/gfx/win/direct_write.h" | 5 #include "ui/gfx/win/direct_write.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/debug/alias.h" | 8 #include "base/debug/alias.h" |
9 #include "base/metrics/field_trial.h" | 9 #include "base/metrics/field_trial.h" |
10 #include "base/win/registry.h" | 10 #include "base/win/registry.h" |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 | 48 |
49 if (!factory) | 49 if (!factory) |
50 return; | 50 return; |
51 | 51 |
52 // The skia call to create a new DirectWrite font manager instance can fail | 52 // The skia call to create a new DirectWrite font manager instance can fail |
53 // if we are unable to get the system font collection from the DirectWrite | 53 // if we are unable to get the system font collection from the DirectWrite |
54 // factory. The GetSystemFontCollection method in the IDWriteFactory | 54 // factory. The GetSystemFontCollection method in the IDWriteFactory |
55 // interface fails with E_INVALIDARG on certain Windows 7 gold versions | 55 // interface fails with E_INVALIDARG on certain Windows 7 gold versions |
56 // (6.1.7600.*). We should just use GDI in these cases. | 56 // (6.1.7600.*). We should just use GDI in these cases. |
57 sk_sp<SkFontMgr> direct_write_font_mgr = | 57 sk_sp<SkFontMgr> direct_write_font_mgr = |
58 SkFontMgr_New_DirectWrite(factory.get()); | 58 SkFontMgr_New_DirectWrite(factory.Get()); |
59 if (!direct_write_font_mgr) | 59 if (!direct_write_font_mgr) |
60 return; | 60 return; |
61 SetDefaultSkiaFactory(std::move(direct_write_font_mgr)); | 61 SetDefaultSkiaFactory(std::move(direct_write_font_mgr)); |
62 gfx::PlatformFontWin::SetDirectWriteFactory(factory.get()); | 62 gfx::PlatformFontWin::SetDirectWriteFactory(factory.Get()); |
63 } | 63 } |
64 | 64 |
65 } // namespace win | 65 } // namespace win |
66 } // namespace gfx | 66 } // namespace gfx |
OLD | NEW |