Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Side by Side Diff: ui/gfx/font_render_params_android.cc

Issue 413003002: Add FontRenderParamsQuery. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: as usual, re-upload against correct branch Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 9
9 namespace gfx { 10 namespace gfx {
10 11
11 namespace { 12 namespace {
12 13
13 // Returns the system's default settings. 14 // Returns the system's default settings.
14 FontRenderParams LoadDefaults() { 15 FontRenderParams LoadDefaults() {
15 FontRenderParams params; 16 FontRenderParams params;
16 params.antialiasing = true; 17 params.antialiasing = true;
17 params.autohinter = true; 18 params.autohinter = true;
18 params.use_bitmaps = true; 19 params.use_bitmaps = true;
19 params.subpixel_rendering = FontRenderParams::SUBPIXEL_RENDERING_NONE; 20 params.subpixel_rendering = FontRenderParams::SUBPIXEL_RENDERING_NONE;
20 21
21 // Use subpixel text positioning to keep consistent character spacing when 22 // Use subpixel text positioning to keep consistent character spacing when
22 // the page is scaled by a fractional factor. 23 // the page is scaled by a fractional factor.
23 params.subpixel_positioning = true; 24 params.subpixel_positioning = true;
24 // Slight hinting renders much better than normal hinting on Android. 25 // Slight hinting renders much better than normal hinting on Android.
25 params.hinting = FontRenderParams::HINTING_SLIGHT; 26 params.hinting = FontRenderParams::HINTING_SLIGHT;
26 27
27 return params; 28 return params;
28 } 29 }
29 30
30 } // namespace 31 } // namespace
31 32
32 const FontRenderParams& GetDefaultFontRenderParams() { 33 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query,
33 static FontRenderParams default_params = LoadDefaults(); 34 std::string* family_out) {
34 return default_params; 35 if (!query.is_empty() || family_out)
msw 2014/07/23 22:16:35 Add a short explanatory comment here, like "// Cus
Daniel Erat 2014/07/23 22:47:18 Done.
35 } 36 NOTIMPLEMENTED();
36 37 CR_DEFINE_STATIC_LOCAL(
37 const FontRenderParams& GetDefaultWebKitFontRenderParams() { 38 const gfx::FontRenderParams, params, (LoadDefaults()));
38 return GetDefaultFontRenderParams(); 39 return params;
39 }
40
41 FontRenderParams GetCustomFontRenderParams(
42 bool for_web_contents,
43 const std::vector<std::string>* family_list,
44 const int* pixel_size,
45 const int* point_size,
46 const int* style,
47 std::string* family_out) {
48 NOTIMPLEMENTED();
49 return GetDefaultFontRenderParams();
50 } 40 }
51 41
52 } // namespace gfx 42 } // namespace gfx
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698