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

Unified Diff: Source/core/page/Settings.cpp

Issue 49913005: Add Settings::deviceScaleAdjustment. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address review comments. Created 7 years, 2 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 a74fe47261ab1c82ed1c9e88d8b1e349a8ad6350..e64134220347d498add41868b212bea0065e1f62 100644
--- a/Source/core/page/Settings.cpp
+++ b/Source/core/page/Settings.cpp
@@ -114,6 +114,7 @@ Settings::Settings(Page* page)
: m_page(0)
, m_mediaTypeOverride("screen")
, m_textAutosizingFontScaleFactor(1)
+ , m_deviceScaleAdjustment(1.0f)
#if HACK_FORCE_TEXT_AUTOSIZING_ON_DESKTOP
, m_textAutosizingWindowSizeOverride(320, 480)
, m_textAutosizingEnabled(true)
@@ -258,10 +259,8 @@ void Settings::setLoadWithOverviewMode(bool loadWithOverviewMode)
m_page->chrome().dispatchViewportPropertiesDidChange(m_page->mainFrame()->document()->viewportDescription());
}
-void Settings::setTextAutosizingFontScaleFactor(float fontScaleFactor)
+void Settings::recalculateTextAutosizingMultipliers()
{
- m_textAutosizingFontScaleFactor = fontScaleFactor;
-
// FIXME: I wonder if this needs to traverse frames like in WebViewImpl::resize, or whether there is only one document per Settings instance?
for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext())
frame->document()->textAutosizer()->recalculateMultipliers();
@@ -269,6 +268,18 @@ void Settings::setTextAutosizingFontScaleFactor(float fontScaleFactor)
m_page->setNeedsRecalcStyleInAllFrames();
}
+void Settings::setTextAutosizingFontScaleFactor(float fontScaleFactor)
+{
+ m_textAutosizingFontScaleFactor = fontScaleFactor;
+ recalculateTextAutosizingMultipliers();
+}
+
+void Settings::setDeviceScaleAdjustment(float deviceScaleAdjustment)
+{
+ m_deviceScaleAdjustment = deviceScaleAdjustment;
+ recalculateTextAutosizingMultipliers();
+}
+
void Settings::setMediaTypeOverride(const String& mediaTypeOverride)
{
if (m_mediaTypeOverride == mediaTypeOverride)

Powered by Google App Engine
This is Rietveld 408576698