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

Unified Diff: Source/core/page/Settings.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/core/page/Settings.cpp
diff --git a/Source/core/page/Settings.cpp b/Source/core/page/Settings.cpp
index 516d40b0d7848f924c4997f6a186295f2c63e107..c7ffbb153d202bfe4d1dcfbce8aa88d9f619e40c 100644
--- a/Source/core/page/Settings.cpp
+++ b/Source/core/page/Settings.cpp
@@ -33,6 +33,7 @@
#include "core/html/HTMLMediaElement.h"
#include "core/inspector/InspectorInstrumentation.h"
#include "core/loader/cache/CachedResourceLoader.h"
+#include "core/page/Chrome.h"
#include "core/page/Frame.h"
#include "core/page/FrameTree.h"
#include "core/page/FrameView.h"
@@ -129,6 +130,8 @@ Settings::Settings(Page* page)
#else
, m_textAutosizingEnabled(false)
#endif
+ , m_useWideViewport(true)
+ , m_loadWithOverviewMode(true)
SETTINGS_INITIALIZER_LIST
, m_isJavaEnabled(false)
, m_loadsImagesAutomatically(false)
@@ -250,6 +253,26 @@ void Settings::setTextAutosizingWindowSizeOverride(const IntSize& textAutosizing
m_page->setNeedsRecalcStyleInAllFrames();
}
+void Settings::setUseWideViewport(bool useWideViewport)
+{
+ if (m_useWideViewport == useWideViewport)
+ return;
+
+ m_useWideViewport = useWideViewport;
+ if (m_page->chrome() && m_page->mainFrame())
+ m_page->chrome()->dispatchViewportPropertiesDidChange(m_page->mainFrame()->document()->viewportArguments());
+}
+
+void Settings::setLoadWithOverviewMode(bool loadWithOverviewMode)
+{
+ if (m_loadWithOverviewMode == loadWithOverviewMode)
+ return;
+
+ m_loadWithOverviewMode = loadWithOverviewMode;
+ if (m_page->chrome() && m_page->mainFrame())
+ m_page->chrome()->dispatchViewportPropertiesDidChange(m_page->mainFrame()->document()->viewportArguments());
+}
+
void Settings::setTextAutosizingFontScaleFactor(float fontScaleFactor)
{
m_textAutosizingFontScaleFactor = fontScaleFactor;

Powered by Google App Engine
This is Rietveld 408576698