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

Side by Side Diff: Source/core/style/ComputedStyle.cpp

Issue 1196913005: Implement animations for Independent CSS Transform Properties (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 904 matching lines...) Expand 10 before | Expand all | Expand 10 after
915 915
916 void ComputedStyle::applyTransform(TransformationMatrix& result, const LayoutSiz e& borderBoxSize, ApplyTransformOrigin applyOrigin, ApplyMotionPath applyMotionP ath, ApplyIndependentTransformProperties applyIndependentTransformProperties) co nst 916 void ComputedStyle::applyTransform(TransformationMatrix& result, const LayoutSiz e& borderBoxSize, ApplyTransformOrigin applyOrigin, ApplyMotionPath applyMotionP ath, ApplyIndependentTransformProperties applyIndependentTransformProperties) co nst
917 { 917 {
918 applyTransform(result, FloatRect(FloatPoint(), FloatSize(borderBoxSize)), ap plyOrigin, applyMotionPath, applyIndependentTransformProperties); 918 applyTransform(result, FloatRect(FloatPoint(), FloatSize(borderBoxSize)), ap plyOrigin, applyMotionPath, applyIndependentTransformProperties);
919 } 919 }
920 920
921 void ComputedStyle::applyTransform(TransformationMatrix& result, const FloatRect & boundingBox, ApplyTransformOrigin applyOrigin, ApplyMotionPath applyMotionPath , ApplyIndependentTransformProperties applyIndependentTransformProperties) const 921 void ComputedStyle::applyTransform(TransformationMatrix& result, const FloatRect & boundingBox, ApplyTransformOrigin applyOrigin, ApplyMotionPath applyMotionPath , ApplyIndependentTransformProperties applyIndependentTransformProperties) const
922 { 922 {
923 if (!hasMotionPath()) 923 if (!hasMotionPath())
924 applyMotionPath = ExcludeMotionPath; 924 applyMotionPath = ExcludeMotionPath;
925
Eric Willigers 2015/06/23 06:50:48 No need to touch this file.
soonm 2015/06/24 00:26:45 Done - Reverted
925 bool applyTransformOrigin = requireTransformOrigin(applyOrigin, applyMotionP ath); 926 bool applyTransformOrigin = requireTransformOrigin(applyOrigin, applyMotionP ath);
926 927
927 float offsetX = transformOriginX().type() == Percent ? boundingBox.x() : 0; 928 float offsetX = transformOriginX().type() == Percent ? boundingBox.x() : 0;
928 float offsetY = transformOriginY().type() == Percent ? boundingBox.y() : 0; 929 float offsetY = transformOriginY().type() == Percent ? boundingBox.y() : 0;
929 930
930 if (applyTransformOrigin) { 931 if (applyTransformOrigin) {
931 result.translate3d(floatValueForLength(transformOriginX(), boundingBox.w idth()) + offsetX, 932 result.translate3d(floatValueForLength(transformOriginX(), boundingBox.w idth()) + offsetX,
932 floatValueForLength(transformOriginY(), boundingBox.height()) + offs etY, 933 floatValueForLength(transformOriginY(), boundingBox.height()) + offs etY,
933 transformOriginZ()); 934 transformOriginZ());
934 } 935 }
(...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after
1760 } 1761 }
1761 1762
1762 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) 1763 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other)
1763 { 1764 {
1764 setEmptyState(other.emptyState()); 1765 setEmptyState(other.emptyState());
1765 if (other.hasExplicitlyInheritedProperties()) 1766 if (other.hasExplicitlyInheritedProperties())
1766 setHasExplicitlyInheritedProperties(); 1767 setHasExplicitlyInheritedProperties();
1767 } 1768 }
1768 1769
1769 } // namespace blink 1770 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698