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

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

Issue 2817663003: Rendering text on insecure-site warnings for WebVR (Closed)
Patch Set: Created 3 years, 8 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
« no previous file with comments | « ui/gfx/font_render_params.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "base/macros.h"
9 9
10 namespace gfx { 10 namespace gfx {
11 11
12 namespace { 12 namespace {
13 13
14 // Returns the system's default settings. 14 // Returns the system's default settings.
15 FontRenderParams LoadDefaults() { 15 FontRenderParams LoadDefaults() {
16 FontRenderParams params; 16 FontRenderParams params;
17 params.antialiasing = true; 17 params.antialiasing = true;
18 params.autohinter = true; 18 params.autohinter = true;
19 params.use_bitmaps = true; 19 params.use_bitmaps = true;
20 params.subpixel_rendering = FontRenderParams::SUBPIXEL_RENDERING_NONE; 20 params.subpixel_rendering = FontRenderParams::SUBPIXEL_RENDERING_NONE;
21 21
22 // Use subpixel text positioning to keep consistent character spacing when 22 // Use subpixel text positioning to keep consistent character spacing when
23 // the page is scaled by a fractional factor. 23 // the page is scaled by a fractional factor.
24 params.subpixel_positioning = true; 24 params.subpixel_positioning = true;
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
acondor_ 2017/04/13 14:00:51 Implementation taken from ui/gfx/font_render_param
31 // A device scale factor used to determine if subpixel positioning
32 // should be used.
33 float device_scale_factor_ = 1.0f;
34
31 } // namespace 35 } // namespace
32 36
33 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query, 37 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query,
34 std::string* family_out) { 38 std::string* family_out) {
35 if (family_out) 39 if (family_out)
36 NOTIMPLEMENTED(); 40 NOTIMPLEMENTED();
37 // Customized font rendering settings are not supported, only defaults. 41 // Customized font rendering settings are not supported, only defaults.
38 CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params, (LoadDefaults())); 42 CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params, (LoadDefaults()));
39 return params; 43 return params;
40 } 44 }
41 45
46 float GetFontRenderParamsDeviceScaleFactor() {
47 return device_scale_factor_;
48 }
49
50 void SetFontRenderParamsDeviceScaleFactor(float device_scale_factor) {
51 device_scale_factor_ = device_scale_factor;
52 }
53
42 } // namespace gfx 54 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/font_render_params.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698