| 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 |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 | 68 |
| 69 scoped_ptr<FontRenderParams> params_; | 69 scoped_ptr<FontRenderParams> params_; |
| 70 | 70 |
| 71 DISALLOW_COPY_AND_ASSIGN(CachedFontRenderParams); | 71 DISALLOW_COPY_AND_ASSIGN(CachedFontRenderParams); |
| 72 }; | 72 }; |
| 73 | 73 |
| 74 } // namespace | 74 } // namespace |
| 75 | 75 |
| 76 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query, | 76 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query, |
| 77 std::string* family_out) { | 77 std::string* family_out) { |
| 78 if (family_out) |
| 79 NOTIMPLEMENTED(); |
| 78 // Customized font rendering settings are not supported, only defaults. | 80 // Customized font rendering settings are not supported, only defaults. |
| 79 if (!query.is_empty() || family_out) | |
| 80 NOTIMPLEMENTED(); | |
| 81 return CachedFontRenderParams::GetInstance()->GetParams( | 81 return CachedFontRenderParams::GetInstance()->GetParams( |
| 82 query.for_web_contents); | 82 query.for_web_contents); |
| 83 } | 83 } |
| 84 | 84 |
| 85 } // namespace gfx | 85 } // namespace gfx |
| OLD | NEW |