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

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

Issue 13943004: Avoid reparsing keyframe selectors (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 6 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
« Source/core/css/CSSParser.cpp ('K') | « Source/core/css/CSSParser.cpp ('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 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 1229 matching lines...) Expand 10 before | Expand all | Expand 10 after
1240 // Apply the declaration to the style. This is a simplified version of t he logic in styleForElement 1240 // Apply the declaration to the style. This is a simplified version of t he logic in styleForElement
1241 initElement(e); 1241 initElement(e);
1242 m_state.initForStyleResolve(document(), e); 1242 m_state.initForStyleResolve(document(), e);
1243 1243
1244 const StyleKeyframe* keyframe = keyframes[i].get(); 1244 const StyleKeyframe* keyframe = keyframes[i].get();
1245 1245
1246 KeyframeValue keyframeValue(0, 0); 1246 KeyframeValue keyframeValue(0, 0);
1247 keyframeValue.setStyle(styleForKeyframe(elementStyle, keyframe, keyframe Value)); 1247 keyframeValue.setStyle(styleForKeyframe(elementStyle, keyframe, keyframe Value));
1248 1248
1249 // Add this keyframe style to all the indicated key times 1249 // Add this keyframe style to all the indicated key times
1250 Vector<float> keys; 1250 Vector<float> keys = keyframe->getKeys();
apavlov 2013/06/26 10:45:40 Vector<float>& keys = keyframe->getKeys(); to foll
1251 keyframe->getKeys(keys);
1252 for (size_t keyIndex = 0; keyIndex < keys.size(); ++keyIndex) { 1251 for (size_t keyIndex = 0; keyIndex < keys.size(); ++keyIndex) {
1253 keyframeValue.setKey(keys[keyIndex]); 1252 keyframeValue.setKey(keys[keyIndex]);
1254 list.insert(keyframeValue); 1253 list.insert(keyframeValue);
1255 } 1254 }
1256 } 1255 }
1257 1256
1258 // If the 0% keyframe is missing, create it (but only if there is at least o ne other keyframe) 1257 // If the 0% keyframe is missing, create it (but only if there is at least o ne other keyframe)
1259 int initialListSize = list.size(); 1258 int initialListSize = list.size();
1260 if (initialListSize > 0 && list[0].key()) { 1259 if (initialListSize > 0 && list[0].key()) {
1261 static StyleKeyframe* zeroPercentKeyframe; 1260 static StyleKeyframe* zeroPercentKeyframe;
(...skipping 2460 matching lines...) Expand 10 before | Expand all | Expand 10 after
3722 info.addMember(m_state, "state"); 3721 info.addMember(m_state, "state");
3723 3722
3724 // FIXME: move this to a place where it would be called only once? 3723 // FIXME: move this to a place where it would be called only once?
3725 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle"); 3724 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle");
3726 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl e"); 3725 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl e");
3727 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle" ); 3726 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle" );
3728 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo urceStyle"); 3727 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo urceStyle");
3729 } 3728 }
3730 3729
3731 } // namespace WebCore 3730 } // namespace WebCore
OLDNEW
« Source/core/css/CSSParser.cpp ('K') | « Source/core/css/CSSParser.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698