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

Side by Side Diff: Source/core/animation/css/CSSAnimations.h

Issue 22364002: Web Animations: Address some review feedback to clean up CSS Animations (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 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/animation/ActiveAnimations.h ('k') | Source/core/animation/css/CSSAnimations.cpp » ('j') | 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) 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 namespace WebCore { 45 namespace WebCore {
46 46
47 class CSSAnimationDataList; 47 class CSSAnimationDataList;
48 class Element; 48 class Element;
49 class RenderObject; 49 class RenderObject;
50 class StyleResolver; 50 class StyleResolver;
51 51
52 class CSSAnimationUpdate FINAL { 52 class CSSAnimationUpdate FINAL {
53 public: 53 public:
54 const StylePropertySet* styles() const { return m_styles.get(); } 54 const StylePropertySet* styles() const { return m_styles.get(); }
55 // Returns whether player has been cancelled and should be filtered during s tyle application.
55 bool isFiltered(const Player* player) const { return m_filtered.contains(pla yer); } 56 bool isFiltered(const Player* player) const { return m_filtered.contains(pla yer); }
56 void cancel(const Player* player) 57 void cancel(const Player* player)
57 { 58 {
58 m_filtered.add(player); 59 m_filtered.add(player);
59 } 60 }
60 void addStyles(const StylePropertySet* styles) 61 void addStyles(const StylePropertySet* styles)
61 { 62 {
62 if (!m_styles) 63 if (!m_styles)
63 m_styles = MutableStylePropertySet::create(); 64 m_styles = MutableStylePropertySet::create();
64 m_styles->mergeAndOverrideOnConflict(styles); 65 m_styles->mergeAndOverrideOnConflict(styles);
(...skipping 11 matching lines...) Expand all
76 bool isEmpty() const { return m_animations.isEmpty(); } 77 bool isEmpty() const { return m_animations.isEmpty(); }
77 void cancel(); 78 void cancel();
78 private: 79 private:
79 typedef HashMap<StringImpl*, Player*> AnimationMap; 80 typedef HashMap<StringImpl*, Player*> AnimationMap;
80 AnimationMap m_animations; 81 AnimationMap m_animations;
81 }; 82 };
82 83
83 } // namespace WebCore 84 } // namespace WebCore
84 85
85 #endif 86 #endif
OLDNEW
« no previous file with comments | « Source/core/animation/ActiveAnimations.h ('k') | Source/core/animation/css/CSSAnimations.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698