| Index: android_webview/native/aw_settings.cc
|
| diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc
|
| index efb2e0e84a514a6dc7ccc3b430fb9a1776ff9e50..92bfbadc22e5a5a3974392361b6b58a4c9472fe7 100644
|
| --- a/android_webview/native/aw_settings.cc
|
| +++ b/android_webview/native/aw_settings.cc
|
| @@ -188,14 +188,20 @@ void AwSettings::PopulateFixedPreferences(WebPreferences* web_prefs) {
|
| void AwSettings::PopulateWebPreferences(WebPreferences* web_prefs) {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| CHECK(env);
|
| -
|
| - AwRenderViewHostExt* render_view_host_ext = GetAwRenderViewHostExt();
|
| - if (!render_view_host_ext) return;
|
| -
|
| ScopedJavaLocalRef<jobject> scoped_obj = aw_settings_.get(env);
|
| jobject obj = scoped_obj.obj();
|
| if (!obj) return;
|
| + // Grab the lock and call PopulateWebPreferencesLocked.
|
| + Java_AwSettings_populateWebPreferences(
|
| + env, obj, reinterpret_cast<jlong>(web_prefs));
|
| +}
|
| +
|
| +void AwSettings::PopulateWebPreferencesLocked(
|
| + JNIEnv* env, jobject obj, jlong web_prefs_ptr) {
|
| + AwRenderViewHostExt* render_view_host_ext = GetAwRenderViewHostExt();
|
| + if (!render_view_host_ext) return;
|
|
|
| + WebPreferences* web_prefs = reinterpret_cast<WebPreferences*>(web_prefs_ptr);
|
| PopulateFixedPreferences(web_prefs);
|
|
|
| web_prefs->text_autosizing_enabled =
|
|
|