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

content/renderer/render_view_impl.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 "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/bind.h"
@@ skipping 2347 matching lines @@
     // URLs larger than |kMaxURLChars| cannot be sent through IPC -
     // see |ParamTraits<GURL>|.
     if (latest_url.possibly_invalid_spec().size() > kMaxURLChars)
       latest_url = GURL();
     Send(new ViewHostMsg_UpdateTargetURL(routing_id_, page_id_, latest_url));
     target_url_ = latest_url;
     target_url_status_ = TARGET_INFLIGHT;
   }
 }
 
+void RenderViewImpl::WebPreferencesUpdated(const WebPreferences& old_prefs) {

[jamesr, 2013/02/19 23:26:21]

I'd rather just do this inline in OnUpdateWebPreferences(), the function
indirection doesn't seem to buy much. Alternately, if this doesn't behave like
other WebPreferences in that it has extra state perhaps it should be managed
separately.

[mnaganov (inactive), 2013/02/20 10:36:49]

This setting resides in WebPreferences because it's used by ChromeClientImpl,
not by WebView itself. The reason we need to make a call to WebView is because
the latter doesn't reinitialize scale when reloading the same page.

In fact, a lot of WebKit settings require some actions to be done on changing
them, but this is hidden inside Settings.cpp in WebCore. However, this
particular setting isn't from WebCore, but rather from WebKit Chromium client,
where WebSettingsImpl doesn't have access to WebViewImpl and thus can't mimic
WebCore Settings' behaviour.

So I don't see a reason for making this a Renderer Preference, but I'm following
your advice on inlining the check inside WebPreferencesUpdated.

+  if (old_prefs.initialize_at_minimum_page_scale !=
+      webkit_preferences_.initialize_at_minimum_page_scale) {
+    webview()->resetScrollAndScaleState();
+  }
+}
+
 gfx::RectF RenderViewImpl::ClientRectToPhysicalWindowRect(
     const gfx::RectF& rect) const {
   gfx::RectF window_rect = rect;
   window_rect.Scale(device_scale_factor_ * webview()->pageScaleFactor());
   return window_rect;
 }
 
 void RenderViewImpl::StartNavStateSyncTimerIfNecessary() {
   // No need to update state if no page has committed yet.
   if (page_id_ == -1)
@@ skipping 2926 matching lines @@
   } else {
     webview()->dragSourceMovedTo(client_point, screen_point, op);
   }
 }
 
 void RenderViewImpl::OnDragSourceSystemDragEnded() {
   webview()->dragSourceSystemDragEnded();
 }
 
 void RenderViewImpl::OnUpdateWebPreferences(const WebPreferences& prefs) {
+  const WebPreferences old_preferences = webkit_preferences_;
   webkit_preferences_ = prefs;
   webkit_preferences_.Apply(webview());
+  WebPreferencesUpdated(old_preferences);
 }
 
 void RenderViewImpl::OnUpdateTimezone() {
   if (webview())
     NotifyTimezoneChange(webview()->mainFrame());
 }
 
 void RenderViewImpl::OnSetAltErrorPageURL(const GURL& url) {
   alternate_error_page_url_ = url;
 }
@@ skipping 1323 matching lines @@
   TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
   RenderProcess::current()->ReleaseTransportDIB(dib);
 }
 
 void RenderViewImpl::DidCommitCompositorFrame() {
   RenderWidget::DidCommitCompositorFrame();
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame());
 }
 
 }  // namespace content