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

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

Issue 22574004: Make targetDensity-dpi account for deviceScaleFactor correctly. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 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 | « no previous file | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/PageScaleConstraintsSet.cpp
diff --git a/Source/core/page/PageScaleConstraintsSet.cpp b/Source/core/page/PageScaleConstraintsSet.cpp
index a5df3e1550f4d867b59bc540180127f51e668d75..294a9beb3f2bdbe3183fb23a9b38191846fb9e66 100644
--- a/Source/core/page/PageScaleConstraintsSet.cpp
+++ b/Source/core/page/PageScaleConstraintsSet.cpp
@@ -111,7 +111,7 @@ static float computeDeprecatedTargetDensityDPIFactor(const ViewportArguments& ar
targetDPI = 240.0f;
else if (arguments.deprecatedTargetDensityDPI != ViewportArguments::ValueAuto)
targetDPI = arguments.deprecatedTargetDensityDPI;
- return targetDPI > 0 ? (deviceScaleFactor * 120.0f) / targetDPI : 1.0f;
+ return targetDPI > 0 ? 160.0f / targetDPI : 1.0f;
}
static float getLayoutWidthForNonWideViewport(const FloatSize& deviceSize, float initialScale)
« no previous file with comments | « no previous file | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698