| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 | 9 |
| 10 namespace gfx { | 10 namespace gfx { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 // Slight hinting renders much better than normal hinting on Android. | 25 // Slight hinting renders much better than normal hinting on Android. |
| 26 params.hinting = FontRenderParams::HINTING_SLIGHT; | 26 params.hinting = FontRenderParams::HINTING_SLIGHT; |
| 27 | 27 |
| 28 return params; | 28 return params; |
| 29 } | 29 } |
| 30 | 30 |
| 31 } // namespace | 31 } // namespace |
| 32 | 32 |
| 33 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query, | 33 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query, |
| 34 std::string* family_out) { | 34 std::string* family_out) { |
| 35 if (family_out) |
| 36 NOTIMPLEMENTED(); |
| 35 // Customized font rendering settings are not supported, only defaults. | 37 // Customized font rendering settings are not supported, only defaults. |
| 36 if (!query.is_empty() || family_out) | |
| 37 NOTIMPLEMENTED(); | |
| 38 CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params, (LoadDefaults())); | 38 CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params, (LoadDefaults())); |
| 39 return params; | 39 return params; |
| 40 } | 40 } |
| 41 | 41 |
| 42 } // namespace gfx | 42 } // namespace gfx |
| OLD | NEW |