| 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();
|
| }
|
|
|