Index: android_webview/native/aw_settings.cc |
diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc |
index 81ff07414d6e52172e10e820a6dbf981b28c6451..9ef64f731435b2f9d5b4727827f59d68f140abe2 100644 |
--- a/android_webview/native/aw_settings.cc |
+++ b/android_webview/native/aw_settings.cc |
@@ -6,17 +6,134 @@ |
#include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" |
#include "android_webview/native/aw_contents.h" |
+#include "base/android/jni_android.h" |
+#include "base/android/jni_string.h" |
+#include "content/public/browser/navigation_controller.h" |
+#include "content/public/browser/navigation_entry.h" |
#include "content/public/browser/render_view_host.h" |
#include "content/public/browser/web_contents.h" |
+#include "content/public/common/content_client.h" |
#include "jni/AwSettings_jni.h" |
#include "webkit/glue/webkit_glue.h" |
+#include "webkit/glue/webpreferences.h" |
+#include "webkit/user_agent/user_agent.h" |
+ |
+using base::android::CheckException; |
+using base::android::ConvertJavaStringToUTF16; |
+using base::android::ConvertUTF16ToJavaString; |
+using base::android::ConvertUTF8ToJavaString; |
+using base::android::GetClass; |
+using base::android::GetFieldID; |
+using base::android::GetMethodIDFromClassName; |
+using base::android::ScopedJavaLocalRef; |
+using webkit_glue::WebPreferences; |
namespace android_webview { |
+struct AwSettings::FieldIds { |
+ // Note on speed. One may think that an approach that reads field values via |
+ // JNI is ineffective and should not be used. Please keep in mind that in the |
+ // legacy WebView the whole Sync method took <1ms on Xoom, and no one is |
+ // expected to modify settings in performance-critical code. |
+ FieldIds() { } |
+ |
+ FieldIds(JNIEnv* env) { |
+ const char* kStringClassName = "Ljava/lang/String;"; |
+ |
+ // FIXME: we should be using a new GetFieldIDFromClassName() with caching. |
bulach
2013/04/25 12:55:57
given the "note on speed" above, would it be possi
|
+ ScopedJavaLocalRef<jclass> clazz( |
+ GetClass(env, "org/chromium/android_webview/AwSettings")); |
+ text_size_percent = GetFieldID(env, clazz, "mTextSizePercent", "I"); |
+ standard_fond_family = |
+ GetFieldID(env, clazz, "mStandardFontFamily", kStringClassName); |
+ fixed_font_family = |
+ GetFieldID(env, clazz, "mFixedFontFamily", kStringClassName); |
+ sans_serif_font_family = |
+ GetFieldID(env, clazz, "mSansSerifFontFamily", kStringClassName); |
+ serif_font_family = |
+ GetFieldID(env, clazz, "mSerifFontFamily", kStringClassName); |
+ cursive_font_family = |
+ GetFieldID(env, clazz, "mCursiveFontFamily", kStringClassName); |
+ fantasy_font_family = |
+ GetFieldID(env, clazz, "mFantasyFontFamily", kStringClassName); |
+ default_text_encoding = |
+ GetFieldID(env, clazz, "mDefaultTextEncoding", kStringClassName); |
+ user_agent = |
+ GetFieldID(env, clazz, "mUserAgent", kStringClassName); |
+ minimum_font_size = GetFieldID(env, clazz, "mMinimumFontSize", "I"); |
+ minimum_logical_font_size = |
+ GetFieldID(env, clazz, "mMinimumLogicalFontSize", "I"); |
+ default_font_size = GetFieldID(env, clazz, "mDefaultFontSize", "I"); |
+ default_fixed_font_size = |
+ GetFieldID(env, clazz, "mDefaultFixedFontSize", "I"); |
+ load_images_automatically = |
+ GetFieldID(env, clazz, "mLoadsImagesAutomatically", "Z"); |
+ images_enabled = |
+ GetFieldID(env, clazz, "mImagesEnabled", "Z"); |
+ java_script_enabled = |
+ GetFieldID(env, clazz, "mJavaScriptEnabled", "Z"); |
+ allow_universal_access_from_file_urls = |
+ GetFieldID(env, clazz, "mAllowUniversalAccessFromFileURLs", "Z"); |
+ allow_file_access_from_file_urls = |
+ GetFieldID(env, clazz, "mAllowFileAccessFromFileURLs", "Z"); |
+ java_script_can_open_windows_automatically = |
+ GetFieldID(env, clazz, "mJavaScriptCanOpenWindowsAutomatically", "Z"); |
+ support_multiple_windows = |
+ GetFieldID(env, clazz, "mSupportMultipleWindows", "Z"); |
+ dom_storage_enabled = |
+ GetFieldID(env, clazz, "mDomStorageEnabled", "Z"); |
+ database_enabled = |
+ GetFieldID(env, clazz, "mDatabaseEnabled", "Z"); |
+ use_wide_viewport = |
+ GetFieldID(env, clazz, "mUseWideViewport", "Z"); |
+ load_with_overview_mode = |
+ GetFieldID(env, clazz, "mLoadWithOverviewMode", "Z"); |
+ media_playback_requires_user_gesture = |
+ GetFieldID(env, clazz, "mMediaPlaybackRequiresUserGesture", "Z"); |
+ default_video_poster_url = |
+ GetFieldID(env, clazz, "mDefaultVideoPosterURL", kStringClassName); |
+ support_deprecated_target_density_dpi = |
+ GetFieldID(env, clazz, "mSupportDeprecatedTargetDensityDPI", "Z"); |
+ dip_scale = |
+ GetFieldID(env, clazz, "mDIPScale", "D"); |
+ initial_page_scale_percent = |
+ GetFieldID(env, clazz, "mInitialPageScalePercent", "F"); |
+ } |
+ |
+ // Field ids |
+ jfieldID text_size_percent; |
+ jfieldID standard_fond_family; |
+ jfieldID fixed_font_family; |
+ jfieldID sans_serif_font_family; |
+ jfieldID serif_font_family; |
+ jfieldID cursive_font_family; |
+ jfieldID fantasy_font_family; |
+ jfieldID default_text_encoding; |
+ jfieldID user_agent; |
+ jfieldID minimum_font_size; |
+ jfieldID minimum_logical_font_size; |
+ jfieldID default_font_size; |
+ jfieldID default_fixed_font_size; |
+ jfieldID load_images_automatically; |
+ jfieldID images_enabled; |
+ jfieldID java_script_enabled; |
+ jfieldID allow_universal_access_from_file_urls; |
+ jfieldID allow_file_access_from_file_urls; |
+ jfieldID java_script_can_open_windows_automatically; |
+ jfieldID support_multiple_windows; |
+ jfieldID dom_storage_enabled; |
+ jfieldID database_enabled; |
+ jfieldID use_wide_viewport; |
+ jfieldID load_with_overview_mode; |
+ jfieldID media_playback_requires_user_gesture; |
+ jfieldID default_video_poster_url; |
+ jfieldID support_deprecated_target_density_dpi; |
+ jfieldID dip_scale; |
+ jfieldID initial_page_scale_percent; |
+}; |
+ |
AwSettings::AwSettings(JNIEnv* env, jobject obj) |
- : java_ref_(env, obj), |
- initial_page_scale_percent_(0), |
- text_zoom_percent_(100) { |
+ : aw_settings_(env, obj) { |
} |
AwSettings::~AwSettings() { |
@@ -39,69 +156,208 @@ void AwSettings::ResetScrollAndScaleState(JNIEnv* env, jobject obj) { |
rvhe->ResetScrollAndScaleState(); |
} |
-void AwSettings::SetInitialPageScale( |
- JNIEnv* env, jobject obj, jfloat page_scale_percent) { |
- if (initial_page_scale_percent_ == page_scale_percent) return; |
- initial_page_scale_percent_ = page_scale_percent; |
- UpdateInitialPageScale(); |
-} |
- |
-void AwSettings::SetTextZoom(JNIEnv* env, jobject obj, jint text_zoom_percent) { |
- if (text_zoom_percent_ == text_zoom_percent) return; |
- text_zoom_percent_ = text_zoom_percent; |
- UpdateTextZoom(); |
-} |
- |
void AwSettings::SetWebContents(JNIEnv* env, jobject obj, jint jweb_contents) { |
content::WebContents* web_contents = |
reinterpret_cast<content::WebContents*>(jweb_contents); |
Observe(web_contents); |
- UpdateRenderViewHostExtSettings(); |
- if (web_contents->GetRenderViewHost()) { |
- UpdateRenderViewHostSettings(web_contents->GetRenderViewHost()); |
- } |
+ UpdateEverything(env, obj); |
} |
-void AwSettings::UpdateInitialPageScale() { |
- AwRenderViewHostExt* rvhe = GetAwRenderViewHostExt(); |
- if (!rvhe) return; |
- if (initial_page_scale_percent_ == 0) { |
- rvhe->SetInitialPageScale(-1); |
+void AwSettings::UpdateEverything() { |
+ JNIEnv* env = base::android::AttachCurrentThread(); |
+ CHECK(env); |
+ ScopedJavaLocalRef<jobject> scoped_obj = aw_settings_.get(env); |
+ jobject obj = scoped_obj.obj(); |
+ if (!obj) return; |
+ UpdateEverything(env, obj); |
+} |
+ |
+void AwSettings::UpdateEverything(JNIEnv* env, jobject obj) { |
+ UpdateInitialPageScale(env, obj); |
+ UpdateWebkitPreferences(env, obj); |
+ UpdateUserAgent(env, obj); |
+ ResetScrollAndScaleState(env, obj); |
+ UpdatePreferredSizeMode(); |
+} |
+ |
+void AwSettings::UpdateUserAgent(JNIEnv* env, jobject obj) { |
+ if (!web_contents()) return; |
+ |
+ if (!field_ids_) |
+ field_ids_.reset(new FieldIds(env)); |
+ |
+ ScopedJavaLocalRef<jstring> str(env, static_cast<jstring>( |
+ env->GetObjectField(obj, field_ids_->user_agent))); |
+ std::string override = base::android::ConvertJavaStringToUTF8(str); |
+ web_contents()->SetUserAgentOverride(override); |
+ |
+ const content::NavigationController& controller = |
+ web_contents()->GetController(); |
+ for (int i = 0; i < controller.GetEntryCount(); ++i) |
+ controller.GetEntryAtIndex(i)->SetIsOverridingUserAgent(true); |
+} |
+ |
+void AwSettings::UpdateWebkitPreferences(JNIEnv* env, jobject obj) { |
+ if (!web_contents()) return; |
+ AwRenderViewHostExt* render_view_host_ext = GetAwRenderViewHostExt(); |
+ if (!render_view_host_ext) return; |
+ |
+ if (!field_ids_) |
+ field_ids_.reset(new FieldIds(env)); |
+ |
+ content::RenderViewHost* render_view_host = |
+ web_contents()->GetRenderViewHost(); |
+ if (!render_view_host) return; |
+ WebPreferences prefs = render_view_host->GetWebkitPreferences(); |
+ |
+ prefs.text_autosizing_enabled = |
+ Java_AwSettings_getTextAutosizingEnabled(env, obj); |
+ |
+ int text_size_percent = env->GetIntField(obj, field_ids_->text_size_percent); |
+ if (prefs.text_autosizing_enabled) { |
+ prefs.font_scale_factor = text_size_percent / 100.0f; |
+ prefs.force_enable_zoom = text_size_percent >= 130; |
+ // Use the default zoom level value when Text Autosizer is turned on. |
+ render_view_host_ext->SetTextZoomLevel(0); |
} else { |
- rvhe->SetInitialPageScale(initial_page_scale_percent_ / 100.0f); |
+ prefs.force_enable_zoom = false; |
+ render_view_host_ext->SetTextZoomLevel(webkit_glue::ZoomFactorToZoomLevel( |
+ text_size_percent / 100.0f)); |
} |
+ |
+ ScopedJavaLocalRef<jstring> str( |
+ env, static_cast<jstring>( |
+ env->GetObjectField(obj, field_ids_->standard_fond_family))); |
+ prefs.standard_font_family_map[WebPreferences::kCommonScript] = |
+ ConvertJavaStringToUTF16(str); |
+ |
+ str.Reset( |
+ env, static_cast<jstring>( |
+ env->GetObjectField(obj, field_ids_->fixed_font_family))); |
+ prefs.fixed_font_family_map[WebPreferences::kCommonScript] = |
+ ConvertJavaStringToUTF16(str); |
+ |
+ str.Reset( |
+ env, static_cast<jstring>( |
+ env->GetObjectField(obj, field_ids_->sans_serif_font_family))); |
+ prefs.sans_serif_font_family_map[WebPreferences::kCommonScript] = |
+ ConvertJavaStringToUTF16(str); |
+ |
+ str.Reset( |
+ env, static_cast<jstring>( |
+ env->GetObjectField(obj, field_ids_->serif_font_family))); |
+ prefs.serif_font_family_map[WebPreferences::kCommonScript] = |
+ ConvertJavaStringToUTF16(str); |
+ |
+ str.Reset( |
+ env, static_cast<jstring>( |
+ env->GetObjectField(obj, field_ids_->cursive_font_family))); |
+ prefs.cursive_font_family_map[WebPreferences::kCommonScript] = |
+ ConvertJavaStringToUTF16(str); |
+ |
+ str.Reset( |
+ env, static_cast<jstring>( |
+ env->GetObjectField(obj, field_ids_->fantasy_font_family))); |
+ prefs.fantasy_font_family_map[WebPreferences::kCommonScript] = |
+ ConvertJavaStringToUTF16(str); |
+ |
+ str.Reset( |
+ env, static_cast<jstring>( |
+ env->GetObjectField(obj, field_ids_->default_text_encoding))); |
+ prefs.default_encoding = ConvertJavaStringToUTF8(str); |
+ |
+ prefs.minimum_font_size = |
+ env->GetIntField(obj, field_ids_->minimum_font_size); |
+ |
+ prefs.minimum_logical_font_size = |
+ env->GetIntField(obj, field_ids_->minimum_logical_font_size); |
+ |
+ prefs.default_font_size = |
+ env->GetIntField(obj, field_ids_->default_font_size); |
+ |
+ prefs.default_fixed_font_size = |
+ env->GetIntField(obj, field_ids_->default_fixed_font_size); |
+ |
+ prefs.loads_images_automatically = |
+ env->GetBooleanField(obj, field_ids_->load_images_automatically); |
+ |
+ prefs.images_enabled = |
+ env->GetBooleanField(obj, field_ids_->images_enabled); |
+ |
+ prefs.javascript_enabled = |
+ env->GetBooleanField(obj, field_ids_->java_script_enabled); |
+ |
+ prefs.allow_universal_access_from_file_urls = env->GetBooleanField( |
+ obj, field_ids_->allow_universal_access_from_file_urls); |
+ |
+ prefs.allow_file_access_from_file_urls = env->GetBooleanField( |
+ obj, field_ids_->allow_file_access_from_file_urls); |
+ |
+ prefs.javascript_can_open_windows_automatically = env->GetBooleanField( |
+ obj, field_ids_->java_script_can_open_windows_automatically); |
+ |
+ prefs.supports_multiple_windows = env->GetBooleanField( |
+ obj, field_ids_->support_multiple_windows); |
+ |
+ prefs.plugins_enabled = !Java_AwSettings_getPluginsDisabled(env, obj); |
+ |
+ prefs.application_cache_enabled = |
+ Java_AwSettings_getAppCacheEnabled(env, obj); |
+ |
+ prefs.local_storage_enabled = env->GetBooleanField( |
+ obj, field_ids_->dom_storage_enabled); |
+ |
+ prefs.databases_enabled = env->GetBooleanField( |
+ obj, field_ids_->database_enabled); |
+ |
+ prefs.double_tap_to_zoom_enabled = prefs.use_wide_viewport = |
+ env->GetBooleanField(obj, field_ids_->use_wide_viewport); |
+ |
+ prefs.initialize_at_minimum_page_scale = env->GetBooleanField( |
+ obj, field_ids_->load_with_overview_mode); |
+ |
+ prefs.user_gesture_required_for_media_playback = env->GetBooleanField( |
+ obj, field_ids_->media_playback_requires_user_gesture); |
+ |
+ str.Reset( |
+ env, static_cast<jstring>( |
+ env->GetObjectField(obj, field_ids_->default_video_poster_url))); |
+ prefs.default_video_poster_url = str.obj() ? |
+ GURL(ConvertJavaStringToUTF8(str)) : GURL(); |
+ |
+ prefs.support_deprecated_target_density_dpi = env->GetBooleanField( |
+ obj, field_ids_->support_deprecated_target_density_dpi); |
+ |
+ render_view_host->UpdateWebkitPreferences(prefs); |
} |
-void AwSettings::UpdateTextZoom() { |
+void AwSettings::UpdateInitialPageScale(JNIEnv* env, jobject obj) { |
AwRenderViewHostExt* rvhe = GetAwRenderViewHostExt(); |
if (!rvhe) return; |
- if (text_zoom_percent_ > 0) { |
- rvhe->SetTextZoomLevel(webkit_glue::ZoomFactorToZoomLevel( |
- text_zoom_percent_ / 100.0f)); |
- } else { |
- // Use the default zoom level value when Text Autosizer is turned on. |
- rvhe->SetTextZoomLevel(0); |
- } |
-} |
-void AwSettings::UpdatePreferredSizeMode( |
- content::RenderViewHost* render_view_host) { |
- render_view_host->EnablePreferredSizeMode(); |
-} |
+ if (!field_ids_) |
+ field_ids_.reset(new FieldIds(env)); |
-void AwSettings::UpdateRenderViewHostExtSettings() { |
- UpdateInitialPageScale(); |
- UpdateTextZoom(); |
+ float initial_page_scale_percent = |
+ env->GetFloatField(obj, field_ids_->initial_page_scale_percent); |
+ if (initial_page_scale_percent == 0) { |
+ rvhe->SetInitialPageScale(-1); |
+ } else { |
+ float dip_scale = static_cast<float>( |
+ env->GetDoubleField(obj, field_ids_->dip_scale)); |
+ rvhe->SetInitialPageScale(initial_page_scale_percent / dip_scale / 100.0f); |
+ } |
} |
-void AwSettings::UpdateRenderViewHostSettings( |
- content::RenderViewHost* render_view_host) { |
- UpdatePreferredSizeMode(render_view_host); |
+void AwSettings::UpdatePreferredSizeMode() { |
+ if (web_contents()->GetRenderViewHost()) { |
+ web_contents()->GetRenderViewHost()->EnablePreferredSizeMode(); |
+ } |
} |
void AwSettings::RenderViewCreated(content::RenderViewHost* render_view_host) { |
- // A single WebContents can normally have 0, 1 or 2 RenderViewHost instances |
+ // A single WebContents can normally have 0 to many RenderViewHost instances |
// associated with it. |
// This is important since there is only one RenderViewHostExt instance per |
// WebContents (and not one RVHExt per RVH, as you might expect) and updating |
@@ -112,8 +368,7 @@ void AwSettings::RenderViewCreated(content::RenderViewHost* render_view_host) { |
// (since we only ever go from 0 to 1 RVH instances) and hence the DCHECK. |
DCHECK(web_contents()->GetRenderViewHost() == render_view_host); |
- UpdateRenderViewHostExtSettings(); |
- UpdateRenderViewHostSettings(render_view_host); |
+ UpdateEverything(); |
} |
static jint Init(JNIEnv* env, |
@@ -124,6 +379,11 @@ static jint Init(JNIEnv* env, |
return reinterpret_cast<jint>(settings); |
} |
+static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) { |
+ return base::android::ConvertUTF8ToJavaString( |
+ env, content::GetUserAgent(GURL())).Release(); |
+} |
+ |
bool RegisterAwSettings(JNIEnv* env) { |
return RegisterNativesImpl(env) >= 0; |
} |