[Android WebView] Implement WebSettings.{get|set}LoadWithOverviewMode

webkit/glue/webpreferences.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webpreferences.h"
 
 #include "base/basictypes.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
@@ skipping 124 matching lines @@
       editing_behavior(EDITING_BEHAVIOR_WIN),
 #elif defined(OS_ANDROID)
       editing_behavior(EDITING_BEHAVIOR_ANDROID),
 #elif defined(OS_POSIX)
       editing_behavior(EDITING_BEHAVIOR_UNIX),
 #else
       editing_behavior(EDITING_BEHAVIOR_MAC),
 #endif
       supports_multiple_windows(true),
       viewport_enabled(false),
+      viewport_scale_content_to_fit(true),
       record_rendering_stats(false),
       cookie_enabled(true)
 #if defined(OS_ANDROID)
       ,
       text_autosizing_enabled(true),
       font_scale_factor(1.0f),
       force_enable_zoom(false),
       user_gesture_required_for_media_playback(true)
 #endif
 {
@@ skipping 321 matching lines @@
   settings->setDeferredImageDecodingEnabled(deferred_image_decoding_enabled);
   settings->setShouldRespectImageOrientation(should_respect_image_orientation);
 
   settings->setUnsafePluginPastingEnabled(false);
   settings->setEditingBehavior(
       static_cast<WebSettings::EditingBehavior>(editing_behavior));
 
   settings->setSupportsMultipleWindows(supports_multiple_windows);
 
   settings->setViewportEnabled(viewport_enabled);
+  if (settings->viewportScaleContentToFit() != viewport_scale_content_to_fit) {
+    settings->setViewportScaleContentToFit(viewport_scale_content_to_fit);
+    web_view->resetScrollAndScaleState();
+  }
 
 #if defined(OS_ANDROID)
   settings->setAllowCustomScrollbarInMainFrame(false);
   settings->setTextAutosizingEnabled(text_autosizing_enabled);
   settings->setTextAutosizingFontScaleFactor(font_scale_factor);
   web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom);
   settings->setAutoZoomFocusedNodeToLegibleScale(true);
   settings->setDoubleTapToZoomEnabled(true);
   settings->setMediaPlaybackRequiresUserGesture(
       user_gesture_required_for_media_playback);
@@ skipping 11 matching lines @@
     WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac);
 COMPILE_ASSERT_MATCHING_ENUMS(
     WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin);
 COMPILE_ASSERT_MATCHING_ENUMS(
     WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix);
 COMPILE_ASSERT_MATCHING_ENUMS(
     WebPreferences::EDITING_BEHAVIOR_ANDROID,
     WebSettings::EditingBehaviorAndroid);
 
 }  // namespace webkit_glue