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

Side by Side Diff: Source/core/animation/KeyframeEffectModel.cpp

Issue 251463003: Web Animations API: Sort keyframes by offset (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Detect null offset Created 6 years, 7 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 19 matching lines...) Expand all
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/animation/KeyframeEffectModel.h" 32 #include "core/animation/KeyframeEffectModel.h"
33 33
34 #include "StylePropertyShorthand.h" 34 #include "StylePropertyShorthand.h"
35 #include "core/animation/TimedItem.h" 35 #include "core/animation/TimedItem.h"
36 #include "wtf/text/StringHash.h" 36 #include "wtf/text/StringHash.h"
37 37
38 namespace WebCore { 38 namespace WebCore {
39 39
40 bool Keyframe::compareOffsets(const RefPtrWillBeMember<Keyframe>& a, const RefPt rWillBeMember<Keyframe>& b)
41 {
42 return a->offset() < b->offset();
43 }
44
45 PropertySet KeyframeEffectModelBase::properties() const 40 PropertySet KeyframeEffectModelBase::properties() const
46 { 41 {
47 PropertySet result; 42 PropertySet result;
48 if (!m_keyframes.size()) { 43 if (!m_keyframes.size()) {
49 return result; 44 return result;
50 } 45 }
51 result = m_keyframes[0]->properties(); 46 result = m_keyframes[0]->properties();
52 for (size_t i = 1; i < m_keyframes.size(); i++) { 47 for (size_t i = 1; i < m_keyframes.size(); i++) {
53 PropertySet extras = m_keyframes[i]->properties(); 48 PropertySet extras = m_keyframes[i]->properties();
54 for (PropertySet::const_iterator it = extras.begin(); it != extras.end() ; ++it) { 49 for (PropertySet::const_iterator it = extras.begin(); it != extras.end() ; ++it) {
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 } 246 }
252 247
253 void KeyframeEffectModelBase::PropertySpecificKeyframeGroup::trace(Visitor* visi tor) 248 void KeyframeEffectModelBase::PropertySpecificKeyframeGroup::trace(Visitor* visi tor)
254 { 249 {
255 #if ENABLE(OILPAN) 250 #if ENABLE(OILPAN)
256 visitor->trace(m_keyframes); 251 visitor->trace(m_keyframes);
257 #endif 252 #endif
258 } 253 }
259 254
260 } // namespace 255 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698