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

Unified Diff: third_party/WebKit/Source/core/css/resolver/FontBuilder.cpp

Issue 2100013002: Implement the new text-size-adjust CSS property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup convertTextSizeAdjust and add a test that better covers it Created 4 years, 6 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: third_party/WebKit/Source/core/css/resolver/FontBuilder.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/FontBuilder.cpp b/third_party/WebKit/Source/core/css/resolver/FontBuilder.cpp
index f10791f5c6d867a2e44f0a9551416bdb2b108159..17c3fa37b6ff98407670a8506ad9f9278713975d 100644
--- a/third_party/WebKit/Source/core/css/resolver/FontBuilder.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/FontBuilder.cpp
@@ -332,8 +332,7 @@ void FontBuilder::updateAdjustedSize(FontDescription& fontDescription, const Com
adjustedSize = getComputedSizeFromSpecifiedSize(fontDescription, style.effectiveZoom(), adjustedSize);
float multiplier = style.textAutosizingMultiplier();
- if (multiplier > 1)
- adjustedSize = TextAutosizer::computeAutosizedFontSize(adjustedSize, multiplier);
+ adjustedSize = TextAutosizer::computeAutosizedFontSize(adjustedSize, multiplier);
fontDescription.setAdjustedSize(adjustedSize);
}
@@ -341,8 +340,7 @@ void FontBuilder::updateComputedSize(FontDescription& fontDescription, const Com
{
float computedSize = getComputedSizeFromSpecifiedSize(fontDescription, style.effectiveZoom(), fontDescription.specifiedSize());
float multiplier = style.textAutosizingMultiplier();
- if (multiplier > 1)
- computedSize = TextAutosizer::computeAutosizedFontSize(computedSize, multiplier);
+ computedSize = TextAutosizer::computeAutosizedFontSize(computedSize, multiplier);
fontDescription.setComputedSize(computedSize);
}

Powered by Google App Engine
This is Rietveld 408576698