Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: ui/gfx/win/direct_write.cc

Issue 2870263002: Rename ScopedComPtr::Receive to ScopedComPtr::GetAddressOf (Closed)
Patch Set: Rebase to 2a6f440 Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/gfx/win/direct_manipulation.cc ('k') | ui/gl/gl_angle_util_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "base/win/scoped_comptr.h" 11 #include "base/win/scoped_comptr.h"
12 #include "base/win/windows_version.h" 12 #include "base/win/windows_version.h"
13 #include "skia/ext/fontmgr_default_win.h" 13 #include "skia/ext/fontmgr_default_win.h"
14 #include "third_party/skia/include/ports/SkFontMgr.h" 14 #include "third_party/skia/include/ports/SkFontMgr.h"
15 #include "third_party/skia/include/ports/SkTypeface_win.h" 15 #include "third_party/skia/include/ports/SkTypeface_win.h"
16 #include "ui/gfx/platform_font_win.h" 16 #include "ui/gfx/platform_font_win.h"
17 #include "ui/gfx/switches.h" 17 #include "ui/gfx/switches.h"
18 18
19 namespace gfx { 19 namespace gfx {
20 namespace win { 20 namespace win {
21 21
22 void CreateDWriteFactory(IDWriteFactory** factory) { 22 void CreateDWriteFactory(IDWriteFactory** factory) {
23 base::win::ScopedComPtr<IUnknown> factory_unknown; 23 base::win::ScopedComPtr<IUnknown> factory_unknown;
24 HRESULT hr = 24 HRESULT hr =
25 DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory), 25 DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory),
26 factory_unknown.Receive()); 26 factory_unknown.GetAddressOf());
27 if (FAILED(hr)) { 27 if (FAILED(hr)) {
28 base::debug::Alias(&hr); 28 base::debug::Alias(&hr);
29 CHECK(false); 29 CHECK(false);
30 return; 30 return;
31 } 31 }
32 factory_unknown.CopyTo(factory); 32 factory_unknown.CopyTo(factory);
33 } 33 }
34 34
35 void MaybeInitializeDirectWrite() { 35 void MaybeInitializeDirectWrite() {
36 static bool tried_dwrite_initialize = false; 36 static bool tried_dwrite_initialize = false;
37 if (tried_dwrite_initialize) 37 if (tried_dwrite_initialize)
38 return; 38 return;
39 tried_dwrite_initialize = true; 39 tried_dwrite_initialize = true;
40 40
41 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 41 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
42 switches::kDisableDirectWriteForUI)) { 42 switches::kDisableDirectWriteForUI)) {
43 return; 43 return;
44 } 44 }
45 45
46 base::win::ScopedComPtr<IDWriteFactory> factory; 46 base::win::ScopedComPtr<IDWriteFactory> factory;
47 CreateDWriteFactory(factory.Receive()); 47 CreateDWriteFactory(factory.GetAddressOf());
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
OLDNEW
« no previous file with comments | « ui/gfx/win/direct_manipulation.cc ('k') | ui/gl/gl_angle_util_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698