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

Unified Diff: android_webview/native/aw_settings.cc

Issue 14234002: [Android WebView] Never turn off viewport and fixed layout (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Jonathan's comment addressed Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/native/aw_settings.h ('k') | android_webview/renderer/aw_render_view_ext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/native/aw_settings.cc
diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc
index ef10859c229cad7d911ca1003a28c147fa47e098..8ab91dd12d6b454c93676997d5fabe40ecb78cb5 100644
--- a/android_webview/native/aw_settings.cc
+++ b/android_webview/native/aw_settings.cc
@@ -13,7 +13,6 @@ namespace android_webview {
AwSettings::AwSettings(JNIEnv* env, jobject obj)
: java_ref_(env, obj),
- enable_fixed_layout_(false),
initial_page_scale_percent_(0),
text_zoom_percent_(100) {
}
@@ -38,13 +37,6 @@ void AwSettings::ResetScrollAndScaleState(JNIEnv* env, jobject obj) {
rvhe->ResetScrollAndScaleState();
}
-void AwSettings::SetEnableFixedLayoutMode(
- JNIEnv* env, jobject obj, jboolean enabled) {
- if (enable_fixed_layout_ == enabled) return;
- enable_fixed_layout_ = enabled;
- UpdateEnableFixedLayoutMode();
-}
-
void AwSettings::SetInitialPageScale(
JNIEnv* env, jobject obj, jfloat page_scale_percent) {
if (initial_page_scale_percent_ == page_scale_percent) return;
@@ -62,13 +54,6 @@ void AwSettings::SetWebContents(JNIEnv* env, jobject obj, jint web_contents) {
Observe(reinterpret_cast<content::WebContents*>(web_contents));
}
-
-void AwSettings::UpdateEnableFixedLayoutMode() {
- AwRenderViewHostExt* rvhe = GetAwRenderViewHostExt();
- if (!rvhe) return;
- rvhe->SetEnableFixedLayoutMode(enable_fixed_layout_);
-}
-
void AwSettings::UpdateInitialPageScale() {
AwRenderViewHostExt* rvhe = GetAwRenderViewHostExt();
if (!rvhe) return;
@@ -92,7 +77,6 @@ void AwSettings::UpdateTextZoom() {
}
void AwSettings::RenderViewCreated(content::RenderViewHost* render_view_host) {
- UpdateEnableFixedLayoutMode();
UpdateInitialPageScale();
UpdateTextZoom();
}
« no previous file with comments | « android_webview/native/aw_settings.h ('k') | android_webview/renderer/aw_render_view_ext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698