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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 1168 matching lines...) Expand 10 before | Expand all | Expand 10 after
1179 return *rareNonInheritedData->m_transitions; 1179 return *rareNonInheritedData->m_transitions;
1180 } 1180 }
1181 1181
1182 const Font& LayoutStyle::font() const { return inherited->font; } 1182 const Font& LayoutStyle::font() const { return inherited->font; }
1183 const FontMetrics& LayoutStyle::fontMetrics() const { return inherited->font.fon tMetrics(); } 1183 const FontMetrics& LayoutStyle::fontMetrics() const { return inherited->font.fon tMetrics(); }
1184 const FontDescription& LayoutStyle::fontDescription() const { return inherited-> font.fontDescription(); } 1184 const FontDescription& LayoutStyle::fontDescription() const { return inherited-> font.fontDescription(); }
1185 float LayoutStyle::specifiedFontSize() const { return fontDescription().specifie dSize(); } 1185 float LayoutStyle::specifiedFontSize() const { return fontDescription().specifie dSize(); }
1186 float LayoutStyle::computedFontSize() const { return fontDescription().computedS ize(); } 1186 float LayoutStyle::computedFontSize() const { return fontDescription().computedS ize(); }
1187 int LayoutStyle::fontSize() const { return fontDescription().computedPixelSize() ; } 1187 int LayoutStyle::fontSize() const { return fontDescription().computedPixelSize() ; }
1188 float LayoutStyle::fontSizeAdjust() const { return fontDescription().sizeAdjust( ); } 1188 float LayoutStyle::fontSizeAdjust() const { return fontDescription().sizeAdjust( ); }
1189 bool LayoutStyle::hasFontSizeAdjust() const { return fontDescription().sizeAdjus t() > 0; } 1189 bool LayoutStyle::hasFontSizeAdjust() const { return fontDescription().hasSizeAd just(); }
1190 FontWeight LayoutStyle::fontWeight() const { return fontDescription().weight(); } 1190 FontWeight LayoutStyle::fontWeight() const { return fontDescription().weight(); }
1191 FontStretch LayoutStyle::fontStretch() const { return fontDescription().stretch( ); } 1191 FontStretch LayoutStyle::fontStretch() const { return fontDescription().stretch( ); }
1192 1192
1193 TextDecoration LayoutStyle::textDecorationsInEffect() const 1193 TextDecoration LayoutStyle::textDecorationsInEffect() const
1194 { 1194 {
1195 int decorations = 0; 1195 int decorations = 0;
1196 1196
1197 const Vector<AppliedTextDecoration>& applied = appliedTextDecorations(); 1197 const Vector<AppliedTextDecoration>& applied = appliedTextDecorations();
1198 1198
1199 for (size_t i = 0; i < applied.size(); ++i) 1199 for (size_t i = 0; i < applied.size(); ++i)
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
1722 horizontal || includeLogicalRightEdge); 1722 horizontal || includeLogicalRightEdge);
1723 1723
1724 edges[BSLeft] = BorderEdge(borderLeftWidth(), 1724 edges[BSLeft] = BorderEdge(borderLeftWidth(),
1725 visitedDependentColor(CSSPropertyBorderLeftColor), 1725 visitedDependentColor(CSSPropertyBorderLeftColor),
1726 borderLeftStyle(), 1726 borderLeftStyle(),
1727 borderLeftIsTransparent(), 1727 borderLeftIsTransparent(),
1728 !horizontal || includeLogicalLeftEdge); 1728 !horizontal || includeLogicalLeftEdge);
1729 } 1729 }
1730 1730
1731 } // namespace blink 1731 } // namespace blink
OLDNEW
« 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