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/native/aw_contents.h" | 8 #include "android_webview/native/aw_contents.h" |
9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 Java_AwSettings_getMediaPlaybackRequiresUserGestureLocked(env, obj); | 199 Java_AwSettings_getMediaPlaybackRequiresUserGestureLocked(env, obj); |
200 | 200 |
201 ScopedJavaLocalRef<jstring> url = | 201 ScopedJavaLocalRef<jstring> url = |
202 Java_AwSettings_getDefaultVideoPosterURLLocked(env, obj); | 202 Java_AwSettings_getDefaultVideoPosterURLLocked(env, obj); |
203 prefs.default_video_poster_url = url.obj() ? | 203 prefs.default_video_poster_url = url.obj() ? |
204 GURL(ConvertJavaStringToUTF8(url)) : GURL(); | 204 GURL(ConvertJavaStringToUTF8(url)) : GURL(); |
205 | 205 |
206 bool support_quirks = Java_AwSettings_getSupportLegacyQuirksLocked(env, obj); | 206 bool support_quirks = Java_AwSettings_getSupportLegacyQuirksLocked(env, obj); |
207 prefs.support_deprecated_target_density_dpi = support_quirks; | 207 prefs.support_deprecated_target_density_dpi = support_quirks; |
208 prefs.use_legacy_background_size_shorthand_behavior = support_quirks; | 208 prefs.use_legacy_background_size_shorthand_behavior = support_quirks; |
| 209 prefs.viewport_meta_layout_size_quirk = support_quirks; |
| 210 prefs.viewport_meta_zero_values_quirk = support_quirks; |
209 | 211 |
210 prefs.password_echo_enabled = | 212 prefs.password_echo_enabled = |
211 Java_AwSettings_getPasswordEchoEnabled(env, obj); | 213 Java_AwSettings_getPasswordEchoEnabled(env, obj); |
212 | 214 |
213 render_view_host->UpdateWebkitPreferences(prefs); | 215 render_view_host->UpdateWebkitPreferences(prefs); |
214 } | 216 } |
215 | 217 |
216 void AwSettings::UpdateInitialPageScaleLocked(JNIEnv* env, jobject obj) { | 218 void AwSettings::UpdateInitialPageScaleLocked(JNIEnv* env, jobject obj) { |
217 AwRenderViewHostExt* rvhe = GetAwRenderViewHostExt(); | 219 AwRenderViewHostExt* rvhe = GetAwRenderViewHostExt(); |
218 if (!rvhe) return; | 220 if (!rvhe) return; |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) { | 273 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) { |
272 return base::android::ConvertUTF8ToJavaString( | 274 return base::android::ConvertUTF8ToJavaString( |
273 env, content::GetUserAgent(GURL())).Release(); | 275 env, content::GetUserAgent(GURL())).Release(); |
274 } | 276 } |
275 | 277 |
276 bool RegisterAwSettings(JNIEnv* env) { | 278 bool RegisterAwSettings(JNIEnv* env) { |
277 return RegisterNativesImpl(env) >= 0; | 279 return RegisterNativesImpl(env) >= 0; |
278 } | 280 } |
279 | 281 |
280 } // namespace android_webview | 282 } // namespace android_webview |
OLD | NEW |