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

Side by Side Diff: chrome/browser/renderer_preferences_util.cc

Issue 10544103: Chromium change of sharing some WebKit API between Android/Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update Created 8 years, 6 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
« no previous file with comments | « no previous file | content/content_renderer.gypi » ('j') | content/content_renderer.gypi » ('J')
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 "chrome/browser/renderer_preferences_util.h" 5 #include "chrome/browser/renderer_preferences_util.h"
6 6
7 #include "chrome/browser/prefs/pref_service.h" 7 #include "chrome/browser/prefs/pref_service.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/common/pref_names.h" 9 #include "chrome/common/pref_names.h"
10 #include "content/public/common/renderer_preferences.h" 10 #include "content/public/common/renderer_preferences.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 // should get their settings from the same place. 43 // should get their settings from the same place.
44 prefs->use_subpixel_positioning = 44 prefs->use_subpixel_positioning =
45 CommandLine::ForCurrentProcess()->HasSwitch( 45 CommandLine::ForCurrentProcess()->HasSwitch(
46 switches::kEnableTextSubpixelPositioning); 46 switches::kEnableTextSubpixelPositioning);
47 47
48 // This color is 0x544d90fe modulated with 0xffffff. 48 // This color is 0x544d90fe modulated with 0xffffff.
49 prefs->active_selection_bg_color = SkColorSetRGB(0xCB, 0xE4, 0xFA); 49 prefs->active_selection_bg_color = SkColorSetRGB(0xCB, 0xE4, 0xFA);
50 prefs->active_selection_fg_color = SK_ColorBLACK; 50 prefs->active_selection_fg_color = SK_ColorBLACK;
51 prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA); 51 prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA);
52 prefs->inactive_selection_fg_color = SK_ColorBLACK; 52 prefs->inactive_selection_fg_color = SK_ColorBLACK;
53 #elif defined(OS_ANDROID)
Daniel Erat 2012/06/14 23:44:20 You need to sync and merge this file; it's changed
Xianzhu 2012/06/15 00:05:00 Sorry I overlooked your newest change. It's great
54 // Use subpixel text positioning to keep consistent character spacing when
55 // the page is scaled by a fractional factor.
56 prefs->use_subpixel_positioning = true;
57 // Slight hinting renders much better than normal hinting on Android.
58 prefs->hinting = content::RENDERER_PREFERENCES_HINTING_SLIGHT;
53 #endif 59 #endif
54 60
55 prefs->enable_referrers = 61 prefs->enable_referrers =
56 profile->GetPrefs()->GetBoolean(prefs::kEnableReferrers); 62 profile->GetPrefs()->GetBoolean(prefs::kEnableReferrers);
57 prefs->default_zoom_level = 63 prefs->default_zoom_level =
58 profile->GetPrefs()->GetDouble(prefs::kDefaultZoomLevel); 64 profile->GetPrefs()->GetDouble(prefs::kDefaultZoomLevel);
59 } 65 }
60 66
61 } // renderer_preferences_util 67 } // renderer_preferences_util
OLDNEW
« no previous file with comments | « no previous file | content/content_renderer.gypi » ('j') | content/content_renderer.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698