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

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

Issue 207683005: Oilpan: Move CSSAnimationData and CSSAnimationDataList to oilpan's heap (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
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 1137 matching lines...) Expand 10 before | Expand all | Expand 10 after
1148 transitionList->remove(i); 1148 transitionList->remove(i);
1149 j = i; 1149 j = i;
1150 } 1150 }
1151 } 1151 }
1152 } 1152 }
1153 } 1153 }
1154 1154
1155 CSSAnimationDataList* RenderStyle::accessAnimations() 1155 CSSAnimationDataList* RenderStyle::accessAnimations()
1156 { 1156 {
1157 if (!rareNonInheritedData.access()->m_animations) 1157 if (!rareNonInheritedData.access()->m_animations)
1158 rareNonInheritedData.access()->m_animations = adoptPtr(new CSSAnimationD ataList()); 1158 rareNonInheritedData.access()->m_animations = adoptPtrWillBeNoop(new CSS AnimationDataList());
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 = adoptPtr(new CSSAnimation DataList()); 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 1169 const CSSAnimationData* RenderStyle::transitionForProperty(CSSPropertyID propert y) const
1170 { 1170 {
1171 if (transitions()) { 1171 if (transitions()) {
1172 for (size_t i = 0; i < transitions()->size(); ++i) { 1172 for (size_t i = 0; i < transitions()->size(); ++i) {
1173 const CSSAnimationData* p = transitions()->animation(i); 1173 const CSSAnimationData* p = transitions()->animation(i);
1174 if (p->animationMode() == CSSAnimationData::AnimateAll || p->propert y() == property) { 1174 if (p->animationMode() == CSSAnimationData::AnimateAll || p->propert y() == property) {
1175 return p; 1175 return p;
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
1655 // right 1655 // right
1656 radiiSum = radii.topRight().height() + radii.bottomRight().height(); 1656 radiiSum = radii.topRight().height() + radii.bottomRight().height();
1657 if (radiiSum > rect.height()) 1657 if (radiiSum > rect.height())
1658 factor = std::min(rect.height() / radiiSum, factor); 1658 factor = std::min(rect.height() / radiiSum, factor);
1659 1659
1660 ASSERT(factor <= 1); 1660 ASSERT(factor <= 1);
1661 return factor; 1661 return factor;
1662 } 1662 }
1663 1663
1664 } // namespace WebCore 1664 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/animation/css/CSSAnimationDataList.cpp ('k') | Source/core/rendering/style/StyleRareNonInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698