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

Unified Diff: Source/core/layout/style/LayoutStyle.cpp

Issue 1024473004: Do not treat '0' as 'none' for font-size-adjust (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased Created 5 years, 9 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 | « Source/core/css/resolver/FontBuilder.cpp ('k') | Source/platform/fonts/FontDescription.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/style/LayoutStyle.cpp
diff --git a/Source/core/layout/style/LayoutStyle.cpp b/Source/core/layout/style/LayoutStyle.cpp
index 238f0ee44cbabd0726dd4a26f7933e36a6fd9ace..4a2e5f8d56e4693c60445232479c043574898310 100644
--- a/Source/core/layout/style/LayoutStyle.cpp
+++ b/Source/core/layout/style/LayoutStyle.cpp
@@ -1186,7 +1186,7 @@ float LayoutStyle::specifiedFontSize() const { return fontDescription().specifie
float LayoutStyle::computedFontSize() const { return fontDescription().computedSize(); }
int LayoutStyle::fontSize() const { return fontDescription().computedPixelSize(); }
float LayoutStyle::fontSizeAdjust() const { return fontDescription().sizeAdjust(); }
-bool LayoutStyle::hasFontSizeAdjust() const { return fontDescription().sizeAdjust() > 0; }
+bool LayoutStyle::hasFontSizeAdjust() const { return fontDescription().hasSizeAdjust(); }
FontWeight LayoutStyle::fontWeight() const { return fontDescription().weight(); }
FontStretch LayoutStyle::fontStretch() const { return fontDescription().stretch(); }
« no previous file with comments | « Source/core/css/resolver/FontBuilder.cpp ('k') | Source/platform/fonts/FontDescription.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698