| Index: ui/gfx/font_render_params_android.cc
|
| diff --git a/ui/gfx/font_render_params_android.cc b/ui/gfx/font_render_params_android.cc
|
| index b67ea1840dfd6a95c7ccaf60f9ceb010a55756c1..c5b17b0304f1a76a8731295a09632cf5cede3737 100644
|
| --- a/ui/gfx/font_render_params_android.cc
|
| +++ b/ui/gfx/font_render_params_android.cc
|
| @@ -5,6 +5,7 @@
|
| #include "ui/gfx/font_render_params.h"
|
|
|
| #include "base/logging.h"
|
| +#include "base/macros.h"
|
|
|
| namespace gfx {
|
|
|
| @@ -29,24 +30,14 @@ FontRenderParams LoadDefaults() {
|
|
|
| } // namespace
|
|
|
| -const FontRenderParams& GetDefaultFontRenderParams() {
|
| - static FontRenderParams default_params = LoadDefaults();
|
| - return default_params;
|
| -}
|
| -
|
| -const FontRenderParams& GetDefaultWebKitFontRenderParams() {
|
| - return GetDefaultFontRenderParams();
|
| -}
|
| -
|
| -FontRenderParams GetCustomFontRenderParams(
|
| - bool for_web_contents,
|
| - const std::vector<std::string>* family_list,
|
| - const int* pixel_size,
|
| - const int* point_size,
|
| - const int* style,
|
| - std::string* family_out) {
|
| - NOTIMPLEMENTED();
|
| - return GetDefaultFontRenderParams();
|
| +FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query,
|
| + std::string* family_out) {
|
| + // Customized font rendering settings are not supported, only defaults.
|
| + if (!query.is_empty() || family_out)
|
| + NOTIMPLEMENTED();
|
| + CR_DEFINE_STATIC_LOCAL(
|
| + const gfx::FontRenderParams, params, (LoadDefaults()));
|
| + return params;
|
| }
|
|
|
| } // namespace gfx
|
|
|