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

Unified Diff: webkit/glue/webpreferences.cc

Issue 12217134: [Android WebView] Implement WebSettings.{get|set}LoadWithOverviewMode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « webkit/glue/webpreferences.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webpreferences.cc
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 3b5ba70ae8f00147b3df42cee789ccf03018d9aa..ac8d245c77f6fabd9e7739b7f8fde6599191b5e9 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -142,6 +142,7 @@ WebPreferences::WebPreferences()
#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)
@@ -483,6 +484,10 @@ void WebPreferences::Apply(WebView* web_view) const {
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);
« no previous file with comments | « webkit/glue/webpreferences.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698