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

Unified Diff: Source/WebKit/chromium/src/WebSettingsImpl.cpp

Issue 14813025: Refactor viewport initialization logic out of WebViewImpl. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix webkit_unit_tests Created 7 years, 7 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: Source/WebKit/chromium/src/WebSettingsImpl.cpp
diff --git a/Source/WebKit/chromium/src/WebSettingsImpl.cpp b/Source/WebKit/chromium/src/WebSettingsImpl.cpp
index eb20c7635664df6f095f3b87ad001deb52f45f6f..bb0114bdda72ab2aa25cbaec6461b9b94188a1ef 100644
--- a/Source/WebKit/chromium/src/WebSettingsImpl.cpp
+++ b/Source/WebKit/chromium/src/WebSettingsImpl.cpp
@@ -53,8 +53,6 @@ WebSettingsImpl::WebSettingsImpl(Settings* settings)
, m_showPaintRects(false)
, m_renderVSyncNotificationEnabled(false)
, m_viewportEnabled(false)
- , m_initializeAtMinimumPageScale(true)
- , m_useWideViewport(true)
, m_gestureTapHighlightEnabled(true)
, m_autoZoomFocusedNodeToLegibleScale(false)
, m_deferredImageDecodingEnabled(false)
@@ -199,9 +197,9 @@ void WebSettingsImpl::setImagesEnabled(bool enabled)
m_settings->setImagesEnabled(enabled);
}
-void WebSettingsImpl::setInitializeAtMinimumPageScale(bool enabled)
+void WebSettingsImpl::setLoadWithOverviewMode(bool enabled)
{
- m_initializeAtMinimumPageScale = enabled;
+ m_settings->setLoadWithOverviewMode(enabled);
}
void WebSettingsImpl::setPluginsEnabled(bool enabled)
@@ -261,7 +259,7 @@ void WebSettingsImpl::setAuthorAndUserStylesEnabled(bool enabled)
void WebSettingsImpl::setUseWideViewport(bool useWideViewport)
{
- m_useWideViewport = useWideViewport;
+ m_settings->setUseWideViewport(useWideViewport);
}
void WebSettingsImpl::setDoubleTapToZoomEnabled(bool doubleTapToZoomEnabled)

Powered by Google App Engine
This is Rietveld 408576698