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

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: Corrections after the WebKit patch 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
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 8dde7b7da823272dab6b3713f96a58f10274d5a8..33b11ce3fc2eba6b1a5cf3bc4b0f8e27f74bd5b5 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2351,6 +2351,13 @@ void RenderViewImpl::UpdateTargetURL(const GURL& url,
}
}
+void RenderViewImpl::WebPreferencesUpdated(const WebPreferences& old_prefs) {
+ 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;
@@ -5292,8 +5299,10 @@ void RenderViewImpl::OnDragSourceSystemDragEnded() {
}
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() {

Powered by Google App Engine
This is Rietveld 408576698