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

Side by Side Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 19037003: Re-use CSSParser logic to parse keyframe keys (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 7 years, 5 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 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 1147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1158 for (unsigned i = 0; i < keyframes.size(); ++i) { 1158 for (unsigned i = 0; i < keyframes.size(); ++i) {
1159 // Apply the declaration to the style. This is a simplified version of t he logic in styleForElement 1159 // Apply the declaration to the style. This is a simplified version of t he logic in styleForElement
1160 m_state.initForStyleResolve(document(), e); 1160 m_state.initForStyleResolve(document(), e);
1161 1161
1162 const StyleKeyframe* keyframe = keyframes[i].get(); 1162 const StyleKeyframe* keyframe = keyframes[i].get();
1163 1163
1164 KeyframeValue keyframeValue(0, 0); 1164 KeyframeValue keyframeValue(0, 0);
1165 keyframeValue.setStyle(styleForKeyframe(elementStyle, keyframe, keyframe Value)); 1165 keyframeValue.setStyle(styleForKeyframe(elementStyle, keyframe, keyframe Value));
1166 1166
1167 // Add this keyframe style to all the indicated key times 1167 // Add this keyframe style to all the indicated key times
1168 Vector<float> keys; 1168 const Vector<float>& keys = keyframe->keys();
1169 keyframe->getKeys(keys);
1170 for (size_t keyIndex = 0; keyIndex < keys.size(); ++keyIndex) { 1169 for (size_t keyIndex = 0; keyIndex < keys.size(); ++keyIndex) {
1171 keyframeValue.setKey(keys[keyIndex]); 1170 keyframeValue.setKey(keys[keyIndex]);
1172 list.insert(keyframeValue); 1171 list.insert(keyframeValue);
1173 } 1172 }
1174 } 1173 }
1175 1174
1176 // If the 0% keyframe is missing, create it (but only if there is at least o ne other keyframe) 1175 // If the 0% keyframe is missing, create it (but only if there is at least o ne other keyframe)
1177 int initialListSize = list.size(); 1176 int initialListSize = list.size();
1178 if (initialListSize > 0 && list[0].key()) { 1177 if (initialListSize > 0 && list[0].key()) {
1179 static StyleKeyframe* zeroPercentKeyframe; 1178 static StyleKeyframe* zeroPercentKeyframe;
(...skipping 1224 matching lines...) Expand 10 before | Expand all | Expand 10 after
2404 void CachedMatchedProperties::reportMemoryUsage(MemoryObjectInfo* memoryObjectIn fo) const 2403 void CachedMatchedProperties::reportMemoryUsage(MemoryObjectInfo* memoryObjectIn fo) const
2405 { 2404 {
2406 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); 2405 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
2407 info.addMember(matchedProperties, "matchedProperties"); 2406 info.addMember(matchedProperties, "matchedProperties");
2408 info.addMember(ranges, "ranges"); 2407 info.addMember(ranges, "ranges");
2409 info.addMember(renderStyle, "renderStyle"); 2408 info.addMember(renderStyle, "renderStyle");
2410 info.addMember(parentRenderStyle, "parentRenderStyle"); 2409 info.addMember(parentRenderStyle, "parentRenderStyle");
2411 } 2410 }
2412 2411
2413 } // namespace WebCore 2412 } // namespace WebCore
OLDNEW
« Source/core/css/CSSParser-in.cpp ('K') | « Source/core/css/CSSParser-in.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698