| 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/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 11 matching lines...) Expand all Loading... |
| 22 params.hinting = FontRenderParams::HINTING_MEDIUM; | 22 params.hinting = FontRenderParams::HINTING_MEDIUM; |
| 23 | 23 |
| 24 return params; | 24 return params; |
| 25 } | 25 } |
| 26 | 26 |
| 27 } // namespace | 27 } // namespace |
| 28 | 28 |
| 29 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query, | 29 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query, |
| 30 std::string* family_out) { | 30 std::string* family_out) { |
| 31 // TODO: Query the OS for font render settings instead of returning defaults. | 31 // TODO: Query the OS for font render settings instead of returning defaults. |
| 32 #if 0 |
| 32 if (!query.is_empty() || family_out) | 33 if (!query.is_empty() || family_out) |
| 33 NOTIMPLEMENTED(); | 34 NOTIMPLEMENTED(); |
| 35 #endif |
| 34 CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params, (LoadDefaults())); | 36 CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params, (LoadDefaults())); |
| 35 return params; | 37 return params; |
| 36 } | 38 } |
| 37 | 39 |
| 38 } // namespace gfx | 40 } // namespace gfx |
| OLD | NEW |