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

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

Issue 212543003: CSS Transforms: Implement transform (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. Created 6 years, 8 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) 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 ASSERT(target != TimedItem::PhaseNone); 70 ASSERT(target != TimedItem::PhaseNone);
71 ASSERT(reference != TimedItem::PhaseNone); 71 ASSERT(reference != TimedItem::PhaseNone);
72 return target > reference; 72 return target > reference;
73 } 73 }
74 74
75 CSSPropertyID propertyForAnimation(CSSPropertyID property) 75 CSSPropertyID propertyForAnimation(CSSPropertyID property)
76 { 76 {
77 switch (property) { 77 switch (property) {
78 case CSSPropertyWebkitPerspective: 78 case CSSPropertyWebkitPerspective:
79 return CSSPropertyPerspective; 79 return CSSPropertyPerspective;
80 case CSSPropertyWebkitTransform:
81 return CSSPropertyTransform;
80 default: 82 default:
81 break; 83 break;
82 } 84 }
83 return property; 85 return property;
84 } 86 }
85 87
86 static void resolveKeyframes(StyleResolver* resolver, Element* element, const El ement& parentElement, const RenderStyle& style, RenderStyle* parentStyle, const AtomicString& name, TimingFunction* defaultTimingFunction, 88 static void resolveKeyframes(StyleResolver* resolver, Element* element, const El ement& parentElement, const RenderStyle& style, RenderStyle* parentStyle, const AtomicString& name, TimingFunction* defaultTimingFunction,
87 KeyframeEffectModel::KeyframeVector& keyframes) 89 KeyframeEffectModel::KeyframeVector& keyframes)
88 { 90 {
89 // When the element is null, use its parent for scoping purposes. 91 // When the element is null, use its parent for scoping purposes.
(...skipping 690 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 case CSSPropertyWebkitMaskPositionX: 782 case CSSPropertyWebkitMaskPositionX:
781 case CSSPropertyWebkitMaskPositionY: 783 case CSSPropertyWebkitMaskPositionY:
782 case CSSPropertyWebkitMaskSize: 784 case CSSPropertyWebkitMaskSize:
783 case CSSPropertyPerspective: 785 case CSSPropertyPerspective:
784 case CSSPropertyWebkitPerspectiveOriginX: 786 case CSSPropertyWebkitPerspectiveOriginX:
785 case CSSPropertyWebkitPerspectiveOriginY: 787 case CSSPropertyWebkitPerspectiveOriginY:
786 case CSSPropertyShapeOutside: 788 case CSSPropertyShapeOutside:
787 case CSSPropertyShapeMargin: 789 case CSSPropertyShapeMargin:
788 case CSSPropertyShapeImageThreshold: 790 case CSSPropertyShapeImageThreshold:
789 case CSSPropertyWebkitTextStrokeColor: 791 case CSSPropertyWebkitTextStrokeColor:
790 case CSSPropertyWebkitTransform:
791 case CSSPropertyWebkitTransformOriginX: 792 case CSSPropertyWebkitTransformOriginX:
792 case CSSPropertyWebkitTransformOriginY: 793 case CSSPropertyWebkitTransformOriginY:
793 case CSSPropertyWebkitTransformOriginZ: 794 case CSSPropertyWebkitTransformOriginZ:
795 case CSSPropertyTransform:
794 case CSSPropertyWidows: 796 case CSSPropertyWidows:
795 case CSSPropertyWidth: 797 case CSSPropertyWidth:
796 case CSSPropertyWordSpacing: 798 case CSSPropertyWordSpacing:
797 case CSSPropertyZIndex: 799 case CSSPropertyZIndex:
798 case CSSPropertyZoom: 800 case CSSPropertyZoom:
799 return true; 801 return true;
800 default: 802 default:
801 return false; 803 return false;
802 } 804 }
803 } 805 }
(...skipping 21 matching lines...) Expand all
825 } 827 }
826 828
827 void CSSAnimationUpdate::trace(Visitor* visitor) 829 void CSSAnimationUpdate::trace(Visitor* visitor)
828 { 830 {
829 visitor->trace(m_newTransitions); 831 visitor->trace(m_newTransitions);
830 visitor->trace(m_activeInterpolationsForAnimations); 832 visitor->trace(m_activeInterpolationsForAnimations);
831 visitor->trace(m_activeInterpolationsForTransitions); 833 visitor->trace(m_activeInterpolationsForTransitions);
832 } 834 }
833 835
834 } // namespace WebCore 836 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/animation/css/CSSAnimatableValueFactory.cpp ('k') | Source/core/animation/css/CSSPropertyEquality.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698