OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "android_webview/native/aw_settings.h" | 5 #include "android_webview/native/aw_settings.h" |
6 | 6 |
7 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" | 7 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" |
8 #include "android_webview/common/aw_content_client.h" | 8 #include "android_webview/common/aw_content_client.h" |
9 #include "android_webview/native/aw_contents.h" | 9 #include "android_webview/native/aw_contents.h" |
10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
11 #include "base/android/jni_string.h" | 11 #include "base/android/jni_string.h" |
12 #include "base/macros.h" | |
12 #include "base/supports_user_data.h" | 13 #include "base/supports_user_data.h" |
13 #include "content/public/browser/navigation_controller.h" | 14 #include "content/public/browser/navigation_controller.h" |
14 #include "content/public/browser/navigation_entry.h" | 15 #include "content/public/browser/navigation_entry.h" |
15 #include "content/public/browser/render_view_host.h" | 16 #include "content/public/browser/render_view_host.h" |
16 #include "content/public/browser/web_contents.h" | 17 #include "content/public/browser/web_contents.h" |
17 #include "content/public/common/renderer_preferences.h" | 18 #include "content/public/common/renderer_preferences.h" |
18 #include "content/public/common/web_preferences.h" | 19 #include "content/public/common/web_preferences.h" |
19 #include "jni/AwSettings_jni.h" | 20 #include "jni/AwSettings_jni.h" |
20 #include "ui/gfx/font_render_params.h" | 21 #include "ui/gfx/font_render_params.h" |
21 | 22 |
22 using base::android::ConvertJavaStringToUTF16; | 23 using base::android::ConvertJavaStringToUTF16; |
23 using base::android::ConvertUTF8ToJavaString; | 24 using base::android::ConvertUTF8ToJavaString; |
24 using base::android::ScopedJavaLocalRef; | 25 using base::android::ScopedJavaLocalRef; |
25 using content::RendererPreferences; | 26 using content::RendererPreferences; |
26 using content::WebPreferences; | 27 using content::WebPreferences; |
27 | 28 |
28 namespace android_webview { | 29 namespace android_webview { |
29 | 30 |
30 namespace { | 31 namespace { |
31 | 32 |
32 void PopulateFixedRendererPreferences(RendererPreferences* prefs) { | 33 void PopulateFixedRendererPreferences(RendererPreferences* prefs) { |
33 prefs->tap_multiple_targets_strategy = | 34 prefs->tap_multiple_targets_strategy = |
34 content::TAP_MULTIPLE_TARGETS_STRATEGY_NONE; | 35 content::TAP_MULTIPLE_TARGETS_STRATEGY_NONE; |
35 | 36 |
36 // TODO(boliu): Deduplicate with chrome/ code. | 37 // TODO(boliu): Deduplicate with chrome/ code. |
37 const gfx::FontRenderParams& params = gfx::GetDefaultWebKitFontRenderParams(); | 38 CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params, |
Daniel Erat
2014/07/23 20:40:34
needed to switch to this to avoid clang compilatio
| |
39 (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(true), NULL))); | |
38 prefs->should_antialias_text = params.antialiasing; | 40 prefs->should_antialias_text = params.antialiasing; |
39 prefs->use_subpixel_positioning = params.subpixel_positioning; | 41 prefs->use_subpixel_positioning = params.subpixel_positioning; |
40 prefs->hinting = params.hinting; | 42 prefs->hinting = params.hinting; |
41 prefs->use_autohinter = params.autohinter; | 43 prefs->use_autohinter = params.autohinter; |
42 prefs->use_bitmaps = params.use_bitmaps; | 44 prefs->use_bitmaps = params.use_bitmaps; |
43 prefs->subpixel_rendering = params.subpixel_rendering; | 45 prefs->subpixel_rendering = params.subpixel_rendering; |
44 } | 46 } |
45 | 47 |
46 void PopulateFixedWebPreferences(WebPreferences* web_prefs) { | 48 void PopulateFixedWebPreferences(WebPreferences* web_prefs) { |
47 web_prefs->shrinks_standalone_images_to_fit = false; | 49 web_prefs->shrinks_standalone_images_to_fit = false; |
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
403 | 405 |
404 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) { | 406 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) { |
405 return base::android::ConvertUTF8ToJavaString(env, GetUserAgent()).Release(); | 407 return base::android::ConvertUTF8ToJavaString(env, GetUserAgent()).Release(); |
406 } | 408 } |
407 | 409 |
408 bool RegisterAwSettings(JNIEnv* env) { | 410 bool RegisterAwSettings(JNIEnv* env) { |
409 return RegisterNativesImpl(env); | 411 return RegisterNativesImpl(env); |
410 } | 412 } |
411 | 413 |
412 } // namespace android_webview | 414 } // namespace android_webview |
OLD | NEW |