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

Unified Diff: Source/core/rendering/TextAutosizer.cpp

Issue 49913005: Add Settings::deviceScaleAdjustment. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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/rendering/TextAutosizer.cpp
diff --git a/Source/core/rendering/TextAutosizer.cpp b/Source/core/rendering/TextAutosizer.cpp
index 0424b5a6e365d27923be17813dc1644291d63025..52740266164fcf8df0342fe9b4e4113d8e436ac7 100644
--- a/Source/core/rendering/TextAutosizer.cpp
+++ b/Source/core/rendering/TextAutosizer.cpp
@@ -208,6 +208,11 @@ float TextAutosizer::clusterMultiplier(WritingMode writingMode, const TextAutosi
float multiplier = logicalClusterWidth / logicalWindowWidth;
multiplier *= m_document->settings()->textAutosizingFontScaleFactor();
+
+ const ViewportDescription& viewportDescription = m_document->page()->mainFrame()->document()->viewportDescription();
+ if (viewportDescription.type == ViewportDescription::UserAgentStyleSheet) {
pdr. 2013/10/29 02:04:44 Can you add this as a helper on ViewportDescriptio
skobes 2013/10/29 17:43:32 Done.
+ multiplier *= m_document->settings()->deviceScaleAdjustment();
+ }
return std::max(1.0f, multiplier);
}

Powered by Google App Engine
This is Rietveld 408576698