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

Unified Diff: content/renderer/render_view_impl.cc

Issue 12217134: [Android WebView] Implement WebSettings.{get|set}LoadWithOverviewMode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments addressed Created 7 years, 10 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 | « content/public/common/common_param_traits_macros.h ('k') | webkit/glue/webpreferences.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index c3d9e24408379689039c34b0b94bb39490274746..fdfa794ccc1e65f3e9100ddba13bb1e569e84b01 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -5332,9 +5332,16 @@ void RenderViewImpl::OnDragSourceSystemDragEnded() {
webview()->dragSourceSystemDragEnded();
}
+
void RenderViewImpl::OnUpdateWebPreferences(const WebPreferences& prefs) {
+ const bool old_initialize_at_minimum_page_scale =
+ webkit_preferences_.initialize_at_minimum_page_scale;
webkit_preferences_ = prefs;
webkit_preferences_.Apply(webview());
+ if (old_initialize_at_minimum_page_scale !=
+ webkit_preferences_.initialize_at_minimum_page_scale) {
+ webview()->resetScrollAndScaleState();
+ }
}
void RenderViewImpl::OnUpdateTimezone() {
« no previous file with comments | « content/public/common/common_param_traits_macros.h ('k') | webkit/glue/webpreferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698