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

Side by Side Diff: Source/core/layout/style/LayoutStyle.cpp

Issue 943463002: Initial implementation of font-size-adjust (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: ExpectedResultForLinuxIsUpdated Created 5 years, 10 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
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 1133 matching lines...) Expand 10 before | Expand all | Expand 10 after
1144 rareNonInheritedData.access()->m_transitions = CSSTransitionData::create (); 1144 rareNonInheritedData.access()->m_transitions = CSSTransitionData::create ();
1145 return *rareNonInheritedData->m_transitions; 1145 return *rareNonInheritedData->m_transitions;
1146 } 1146 }
1147 1147
1148 const Font& LayoutStyle::font() const { return inherited->font; } 1148 const Font& LayoutStyle::font() const { return inherited->font; }
1149 const FontMetrics& LayoutStyle::fontMetrics() const { return inherited->font.fon tMetrics(); } 1149 const FontMetrics& LayoutStyle::fontMetrics() const { return inherited->font.fon tMetrics(); }
1150 const FontDescription& LayoutStyle::fontDescription() const { return inherited-> font.fontDescription(); } 1150 const FontDescription& LayoutStyle::fontDescription() const { return inherited-> font.fontDescription(); }
1151 float LayoutStyle::specifiedFontSize() const { return fontDescription().specifie dSize(); } 1151 float LayoutStyle::specifiedFontSize() const { return fontDescription().specifie dSize(); }
1152 float LayoutStyle::computedFontSize() const { return fontDescription().computedS ize(); } 1152 float LayoutStyle::computedFontSize() const { return fontDescription().computedS ize(); }
1153 int LayoutStyle::fontSize() const { return fontDescription().computedPixelSize() ; } 1153 int LayoutStyle::fontSize() const { return fontDescription().computedPixelSize() ; }
1154 float LayoutStyle::fontSizeAdjust() const { return fontDescription().sizeAdjust( ); }
1155 bool LayoutStyle::hasFontSizeAdjust() const { return fontDescription().sizeAdjus t() > 0; }
1154 FontWeight LayoutStyle::fontWeight() const { return fontDescription().weight(); } 1156 FontWeight LayoutStyle::fontWeight() const { return fontDescription().weight(); }
1155 FontStretch LayoutStyle::fontStretch() const { return fontDescription().stretch( ); } 1157 FontStretch LayoutStyle::fontStretch() const { return fontDescription().stretch( ); }
1156 1158
1157 TextDecoration LayoutStyle::textDecorationsInEffect() const 1159 TextDecoration LayoutStyle::textDecorationsInEffect() const
1158 { 1160 {
1159 int decorations = 0; 1161 int decorations = 0;
1160 1162
1161 const Vector<AppliedTextDecoration>& applied = appliedTextDecorations(); 1163 const Vector<AppliedTextDecoration>& applied = appliedTextDecorations();
1162 1164
1163 for (size_t i = 0; i < applied.size(); ++i) 1165 for (size_t i = 0; i < applied.size(); ++i)
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
1679 horizontal || includeLogicalRightEdge); 1681 horizontal || includeLogicalRightEdge);
1680 1682
1681 edges[BSLeft] = BorderEdge(borderLeftWidth(), 1683 edges[BSLeft] = BorderEdge(borderLeftWidth(),
1682 visitedDependentColor(CSSPropertyBorderLeftColor), 1684 visitedDependentColor(CSSPropertyBorderLeftColor),
1683 borderLeftStyle(), 1685 borderLeftStyle(),
1684 borderLeftIsTransparent(), 1686 borderLeftIsTransparent(),
1685 !horizontal || includeLogicalLeftEdge); 1687 !horizontal || includeLogicalLeftEdge);
1686 } 1688 }
1687 1689
1688 } // namespace blink 1690 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698