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

Side by Side Diff: Source/core/rendering/style/RenderStyle.cpp

Issue 241713002: Remove some dead code from rendering/ folder (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | no next file » | 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 1148 matching lines...) Expand 10 before | Expand all | Expand 10 after
1159 return rareNonInheritedData->m_animations.get(); 1159 return rareNonInheritedData->m_animations.get();
1160 } 1160 }
1161 1161
1162 CSSAnimationDataList* RenderStyle::accessTransitions() 1162 CSSAnimationDataList* RenderStyle::accessTransitions()
1163 { 1163 {
1164 if (!rareNonInheritedData.access()->m_transitions) 1164 if (!rareNonInheritedData.access()->m_transitions)
1165 rareNonInheritedData.access()->m_transitions = adoptPtrWillBeNoop(new CS SAnimationDataList()); 1165 rareNonInheritedData.access()->m_transitions = adoptPtrWillBeNoop(new CS SAnimationDataList());
1166 return rareNonInheritedData->m_transitions.get(); 1166 return rareNonInheritedData->m_transitions.get();
1167 } 1167 }
1168 1168
1169 const CSSAnimationData* RenderStyle::transitionForProperty(CSSPropertyID propert y) const
1170 {
1171 if (transitions()) {
1172 for (size_t i = 0; i < transitions()->size(); ++i) {
1173 const CSSAnimationData* p = transitions()->animation(i);
1174 if (p->animationMode() == CSSAnimationData::AnimateAll || p->propert y() == property) {
1175 return p;
1176 }
1177 }
1178 }
1179 return 0;
1180 }
1181
1182 const Font& RenderStyle::font() const { return inherited->font; } 1169 const Font& RenderStyle::font() const { return inherited->font; }
1183 const FontMetrics& RenderStyle::fontMetrics() const { return inherited->font.fon tMetrics(); } 1170 const FontMetrics& RenderStyle::fontMetrics() const { return inherited->font.fon tMetrics(); }
1184 const FontDescription& RenderStyle::fontDescription() const { return inherited-> font.fontDescription(); } 1171 const FontDescription& RenderStyle::fontDescription() const { return inherited-> font.fontDescription(); }
1185 float RenderStyle::specifiedFontSize() const { return fontDescription().specifie dSize(); } 1172 float RenderStyle::specifiedFontSize() const { return fontDescription().specifie dSize(); }
1186 float RenderStyle::computedFontSize() const { return fontDescription().computedS ize(); } 1173 float RenderStyle::computedFontSize() const { return fontDescription().computedS ize(); }
1187 int RenderStyle::fontSize() const { return fontDescription().computedPixelSize() ; } 1174 int RenderStyle::fontSize() const { return fontDescription().computedPixelSize() ; }
1188 FontWeight RenderStyle::fontWeight() const { return fontDescription().weight(); } 1175 FontWeight RenderStyle::fontWeight() const { return fontDescription().weight(); }
1189 1176
1190 float RenderStyle::wordSpacing() const { return fontDescription().wordSpacing(); } 1177 float RenderStyle::wordSpacing() const { return fontDescription().wordSpacing(); }
1191 float RenderStyle::letterSpacing() const { return fontDescription().letterSpacin g(); } 1178 float RenderStyle::letterSpacing() const { return fontDescription().letterSpacin g(); }
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
1655 // right 1642 // right
1656 radiiSum = radii.topRight().height() + radii.bottomRight().height(); 1643 radiiSum = radii.topRight().height() + radii.bottomRight().height();
1657 if (radiiSum > rect.height()) 1644 if (radiiSum > rect.height())
1658 factor = std::min(rect.height() / radiiSum, factor); 1645 factor = std::min(rect.height() / radiiSum, factor);
1659 1646
1660 ASSERT(factor <= 1); 1647 ASSERT(factor <= 1);
1661 return factor; 1648 return factor;
1662 } 1649 }
1663 1650
1664 } // namespace WebCore 1651 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698