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

Unified Diff: sky/engine/core/css/FontSize.cpp

Issue 681553003: Remove a bunch of unused or never-set settings. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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
« no previous file with comments | « no previous file | sky/engine/core/dom/Position.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/FontSize.cpp
diff --git a/sky/engine/core/css/FontSize.cpp b/sky/engine/core/css/FontSize.cpp
index 437397093f0d4b9922e0fb197f2a2593fcc93027..86e688d06aecb48eb086e63df477cba25857ec68 100644
--- a/sky/engine/core/css/FontSize.cpp
+++ b/sky/engine/core/css/FontSize.cpp
@@ -58,8 +58,8 @@ float FontSize::getComputedSizeFromSpecifiedSize(const Document* document, float
if (!settings)
return 1.0f;
- int minSize = settings->minimumFontSize();
- int minLogicalSize = settings->minimumLogicalFontSize();
+ int minSize = 0;
+ int minLogicalSize = 0;
float zoomedSize = specifiedSize * zoomFactor;
// Apply the hard minimum first. We only apply the hard minimum if after zooming we're still too small.
@@ -126,7 +126,7 @@ float FontSize::fontSizeForKeyword(const Document* document, CSSValueID keyword,
}
// Value is outside the range of the table. Apply the scale factor instead.
- float minLogicalSize = std::max(settings->minimumLogicalFontSize(), 1);
+ float minLogicalSize = 1;
return std::max(fontSizeFactors[keyword - CSSValueXxSmall] * mediumSize, minLogicalSize);
}
« no previous file with comments | « no previous file | sky/engine/core/dom/Position.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698