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

Side by Side Diff: trunk/Source/core/animation/css/CSSAnimations.cpp

Issue 75463008: Revert 162247 "Revert 162180 "[Refactoring] Remove include "core..." (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 7 years, 1 month 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 | « no previous file | trunk/Source/core/css/ElementRuleCollector.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 21 matching lines...) Expand all
32 #include "core/animation/css/CSSAnimations.h" 32 #include "core/animation/css/CSSAnimations.h"
33 33
34 #include "StylePropertyShorthand.h" 34 #include "StylePropertyShorthand.h"
35 #include "core/animation/ActiveAnimations.h" 35 #include "core/animation/ActiveAnimations.h"
36 #include "core/animation/DocumentTimeline.h" 36 #include "core/animation/DocumentTimeline.h"
37 #include "core/animation/KeyframeAnimationEffect.h" 37 #include "core/animation/KeyframeAnimationEffect.h"
38 #include "core/animation/css/CSSAnimatableValueFactory.h" 38 #include "core/animation/css/CSSAnimatableValueFactory.h"
39 #include "core/css/CSSKeyframeRule.h" 39 #include "core/css/CSSKeyframeRule.h"
40 #include "core/css/resolver/StyleResolver.h" 40 #include "core/css/resolver/StyleResolver.h"
41 #include "core/dom/Element.h" 41 #include "core/dom/Element.h"
42 #include "core/dom/PseudoElement.h"
42 #include "core/events/ThreadLocalEventNames.h" 43 #include "core/events/ThreadLocalEventNames.h"
43 #include "core/events/TransitionEvent.h" 44 #include "core/events/TransitionEvent.h"
44 #include "core/events/WebKitAnimationEvent.h" 45 #include "core/events/WebKitAnimationEvent.h"
45 #include "core/frame/UseCounter.h" 46 #include "core/frame/UseCounter.h"
46 #include "core/frame/animation/CSSPropertyAnimation.h" 47 #include "core/frame/animation/CSSPropertyAnimation.h"
47 #include "core/platform/animation/CSSAnimationDataList.h" 48 #include "core/platform/animation/CSSAnimationDataList.h"
48 #include "core/platform/animation/TimingFunction.h" 49 #include "core/platform/animation/TimingFunction.h"
50 #include "core/rendering/RenderObject.h"
49 #include "core/rendering/style/KeyframeList.h" 51 #include "core/rendering/style/KeyframeList.h"
50 #include "public/platform/Platform.h" 52 #include "public/platform/Platform.h"
51 #include "wtf/HashSet.h" 53 #include "wtf/HashSet.h"
52 54
53 namespace WebCore { 55 namespace WebCore {
54 56
55 struct CandidateTransition { 57 struct CandidateTransition {
56 CandidateTransition(PassRefPtr<AnimatableValue> from, PassRefPtr<AnimatableV alue> to, const CSSAnimationData* anim) 58 CandidateTransition(PassRefPtr<AnimatableValue> from, PassRefPtr<AnimatableV alue> to, const CSSAnimationData* anim)
57 : from(from) 59 : from(from)
58 , to(to) 60 , to(to)
(...skipping 816 matching lines...) Expand 10 before | Expand all | Expand 10 after
875 CSSPropertyID id = convertToCSSPropertyID(i); 877 CSSPropertyID id = convertToCSSPropertyID(i);
876 if (isAnimatableProperty(id)) 878 if (isAnimatableProperty(id))
877 properties.append(id); 879 properties.append(id);
878 } 880 }
879 propertyShorthand = StylePropertyShorthand(CSSPropertyInvalid, propertie s.begin(), properties.size()); 881 propertyShorthand = StylePropertyShorthand(CSSPropertyInvalid, propertie s.begin(), properties.size());
880 } 882 }
881 return propertyShorthand; 883 return propertyShorthand;
882 } 884 }
883 885
884 } // namespace WebCore 886 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | trunk/Source/core/css/ElementRuleCollector.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698