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/font_render_params.h" | 5 #include "ui/gfx/font_render_params.h" |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/memory/singleton.h" | 8 #include "base/memory/singleton.h" |
9 #include "ui/gfx/win/singleton_hwnd.h" | 9 #include "ui/gfx/win/singleton_hwnd.h" |
10 | 10 |
11 namespace gfx { | 11 namespace gfx { |
12 | 12 |
13 namespace { | 13 namespace { |
14 | 14 |
15 // Caches font render params and updates them on system notifications. | 15 // Caches font render params and updates them on system notifications. |
16 class CachedFontRenderParams : public gfx::SingletonHwnd::Observer { | 16 class CachedFontRenderParams : public gfx::SingletonHwnd::Observer { |
17 public: | 17 public: |
18 static CachedFontRenderParams* GetInstance() { | 18 static CachedFontRenderParams* GetInstance() { |
19 return Singleton<CachedFontRenderParams>::get(); | 19 return Singleton<CachedFontRenderParams>::get(); |
20 } | 20 } |
21 | 21 |
22 const FontRenderParams& GetParams() { | 22 const FontRenderParams& GetParams(bool for_web_contents) { |
23 if (params_) | 23 if (params_) |
24 return *params_; | 24 return *params_; |
25 | 25 |
26 params_.reset(new FontRenderParams()); | 26 params_.reset(new FontRenderParams()); |
27 params_->antialiasing = false; | 27 params_->antialiasing = false; |
28 params_->subpixel_positioning = false; | 28 params_->subpixel_positioning = false; |
29 params_->autohinter = false; | 29 params_->autohinter = false; |
30 params_->use_bitmaps = false; | 30 params_->use_bitmaps = false; |
31 params_->hinting = FontRenderParams::HINTING_MEDIUM; | 31 params_->hinting = FontRenderParams::HINTING_MEDIUM; |
32 params_->subpixel_rendering = FontRenderParams::SUBPIXEL_RENDERING_NONE; | 32 params_->subpixel_rendering = FontRenderParams::SUBPIXEL_RENDERING_NONE; |
33 | 33 |
34 BOOL enabled = false; | 34 BOOL enabled = false; |
35 if (SystemParametersInfo(SPI_GETFONTSMOOTHING, 0, &enabled, 0) && enabled) { | 35 if (SystemParametersInfo(SPI_GETFONTSMOOTHING, 0, &enabled, 0) && enabled) { |
36 params_->antialiasing = true; | 36 params_->antialiasing = true; |
37 params_->subpixel_positioning = true; | 37 // Subpixel positioning is not yet implemented for UI. crbug.com/389649 |
| 38 params_->subpixel_positioning = for_web_contents; |
38 | 39 |
39 UINT type = 0; | 40 UINT type = 0; |
40 if (SystemParametersInfo(SPI_GETFONTSMOOTHINGTYPE, 0, &type, 0) && | 41 if (SystemParametersInfo(SPI_GETFONTSMOOTHINGTYPE, 0, &type, 0) && |
41 type == FE_FONTSMOOTHINGCLEARTYPE) { | 42 type == FE_FONTSMOOTHINGCLEARTYPE) { |
42 params_->subpixel_rendering = FontRenderParams::SUBPIXEL_RENDERING_RGB; | 43 params_->subpixel_rendering = FontRenderParams::SUBPIXEL_RENDERING_RGB; |
43 } | 44 } |
44 } | 45 } |
45 gfx::SingletonHwnd::GetInstance()->AddObserver(this); | 46 gfx::SingletonHwnd::GetInstance()->AddObserver(this); |
46 return *params_; | 47 return *params_; |
47 } | 48 } |
(...skipping 22 matching lines...) Expand all Loading... |
70 DISALLOW_COPY_AND_ASSIGN(CachedFontRenderParams); | 71 DISALLOW_COPY_AND_ASSIGN(CachedFontRenderParams); |
71 }; | 72 }; |
72 | 73 |
73 } // namespace | 74 } // namespace |
74 | 75 |
75 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query, | 76 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query, |
76 std::string* family_out) { | 77 std::string* family_out) { |
77 // Customized font rendering settings are not supported, only defaults. | 78 // Customized font rendering settings are not supported, only defaults. |
78 if (!query.is_empty() || family_out) | 79 if (!query.is_empty() || family_out) |
79 NOTIMPLEMENTED(); | 80 NOTIMPLEMENTED(); |
80 return CachedFontRenderParams::GetInstance()->GetParams(); | 81 return CachedFontRenderParams::GetInstance()->GetParams( |
| 82 query.for_web_contents); |
81 } | 83 } |
82 | 84 |
83 } // namespace gfx | 85 } // namespace gfx |
OLD | NEW |