Source/core/animation/css/CSSAnimations.cpp - Issue 649153002: Align -webkit-transform-origin behaviour with transform-origin behaviour

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

Issue 649153002: Align -webkit-transform-origin behaviour with transform-origin behaviour (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: git cl try Created 6 years, 2 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

« no previous file with comments | « LayoutTests/transitions/unprefixed-transform-origin-expected.txt ('k') | Source/core/css/CSSProperties.in » ('j') | no next file with comments »

OLD	NEW
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 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
68 return CSSPropertyPerspective;	68 return CSSPropertyPerspective;

69 case CSSPropertyWebkitTransform:	69 case CSSPropertyWebkitTransform:

70 return CSSPropertyTransform;	70 return CSSPropertyTransform;

71 case CSSPropertyWebkitPerspectiveOriginX:	71 case CSSPropertyWebkitPerspectiveOriginX:

72 case CSSPropertyWebkitPerspectiveOriginY:	72 case CSSPropertyWebkitPerspectiveOriginY:

73 case CSSPropertyWebkitPerspectiveOrigin:	73 case CSSPropertyWebkitPerspectiveOrigin:

74 return CSSPropertyPerspectiveOrigin;	74 return CSSPropertyPerspectiveOrigin;

75 case CSSPropertyWebkitTransformOriginX:	75 case CSSPropertyWebkitTransformOriginX:

76 case CSSPropertyWebkitTransformOriginY:	76 case CSSPropertyWebkitTransformOriginY:

77 case CSSPropertyWebkitTransformOriginZ:	77 case CSSPropertyWebkitTransformOriginZ:

	78 case CSSPropertyWebkitTransformOrigin:

78 return CSSPropertyTransformOrigin;	79 return CSSPropertyTransformOrigin;

79 default:	80 default:

80 break;	81 break;

81 }	82 }

82 return property;	83 return property;

83 }	84 }

84	85

85 static void resolveKeyframes(StyleResolver* resolver, const Element* animatingEl ement, Element& element, const RenderStyle& style, RenderStyle* parentStyle, con st AtomicString& name, TimingFunction* defaultTimingFunction,	86 static void resolveKeyframes(StyleResolver* resolver, const Element* animatingEl ement, Element& element, const RenderStyle& style, RenderStyle* parentStyle, con st AtomicString& name, TimingFunction* defaultTimingFunction,

86 AnimatableValueKeyframeVector& keyframes)	87 AnimatableValueKeyframeVector& keyframes)

87 {	88 {

(...skipping 642 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
730 #if ENABLE(OILPAN)	731 #if ENABLE(OILPAN)

731 visitor->trace(m_newTransitions);	732 visitor->trace(m_newTransitions);

732 visitor->trace(m_activeInterpolationsForAnimations);	733 visitor->trace(m_activeInterpolationsForAnimations);

733 visitor->trace(m_activeInterpolationsForTransitions);	734 visitor->trace(m_activeInterpolationsForTransitions);

734 visitor->trace(m_newAnimations);	735 visitor->trace(m_newAnimations);

735 visitor->trace(m_cancelledAnimationPlayers);	736 visitor->trace(m_cancelledAnimationPlayers);

736 #endif	737 #endif

737 }	738 }

738	739

739 } // namespace blink	740 } // namespace blink

OLD	NEW