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

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

Issue 1196913005: Implement animations for Independent CSS Transform Properties (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove Compositor Animations and add tests for inherit and initial 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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
844 bool hasCompositorProxy() const { return rareNonInheritedData->m_hasComposit orProxy; } 844 bool hasCompositorProxy() const { return rareNonInheritedData->m_hasComposit orProxy; }
845 const TransformOperations& transform() const { return rareNonInheritedData-> m_transform->m_operations; } 845 const TransformOperations& transform() const { return rareNonInheritedData-> m_transform->m_operations; }
846 const TransformOrigin& transformOrigin() const { return rareNonInheritedData ->m_transform->m_origin; } 846 const TransformOrigin& transformOrigin() const { return rareNonInheritedData ->m_transform->m_origin; }
847 const Length& transformOriginX() const { return transformOrigin().x(); } 847 const Length& transformOriginX() const { return transformOrigin().x(); }
848 const Length& transformOriginY() const { return transformOrigin().y(); } 848 const Length& transformOriginY() const { return transformOrigin().y(); }
849 TranslateTransformOperation* translate() const { return rareNonInheritedData ->m_transform->m_translate.get(); } 849 TranslateTransformOperation* translate() const { return rareNonInheritedData ->m_transform->m_translate.get(); }
850 RotateTransformOperation* rotate() const { return rareNonInheritedData->m_tr ansform->m_rotate.get(); } 850 RotateTransformOperation* rotate() const { return rareNonInheritedData->m_tr ansform->m_rotate.get(); }
851 ScaleTransformOperation* scale() const { return rareNonInheritedData->m_tran sform->m_scale.get(); } 851 ScaleTransformOperation* scale() const { return rareNonInheritedData->m_tran sform->m_scale.get(); }
852 float transformOriginZ() const { return transformOrigin().z(); } 852 float transformOriginZ() const { return transformOrigin().z(); }
853 bool has3DTransform() const { return rareNonInheritedData->m_transform->has3 DTransform(); } 853 bool has3DTransform() const { return rareNonInheritedData->m_transform->has3 DTransform(); }
854 bool hasTransformOperations() const { return !rareNonInheritedData->m_transf orm->m_operations.operations().isEmpty(); }
854 bool hasTransform() const { return hasTransformOperations() || hasMotionPath () || hasCurrentTransformAnimation() || translate() || rotate() || scale(); } 855 bool hasTransform() const { return hasTransformOperations() || hasMotionPath () || hasCurrentTransformAnimation() || translate() || rotate() || scale(); }
855 bool transformDataEquivalent(const ComputedStyle& otherStyle) const { return rareNonInheritedData->m_transform == otherStyle.rareNonInheritedData->m_transfo rm; } 856 bool transformDataEquivalent(const ComputedStyle& otherStyle) const { return rareNonInheritedData->m_transform == otherStyle.rareNonInheritedData->m_transfo rm; }
856 857
857 StyleMotionPath* motionPath() const { return rareNonInheritedData->m_transfo rm->m_motion.m_path.get(); } 858 StyleMotionPath* motionPath() const { return rareNonInheritedData->m_transfo rm->m_motion.m_path.get(); }
858 bool hasMotionPath() const { return rareNonInheritedData->m_transform->m_mot ion.m_path; } 859 bool hasMotionPath() const { return rareNonInheritedData->m_transform->m_mot ion.m_path; }
859 const Length& motionOffset() const { return rareNonInheritedData->m_transfor m->m_motion.m_offset; } 860 const Length& motionOffset() const { return rareNonInheritedData->m_transfor m->m_motion.m_offset; }
860 float motionRotation() const { return rareNonInheritedData->m_transform->m_m otion.m_rotation; } 861 float motionRotation() const { return rareNonInheritedData->m_transform->m_m otion.m_rotation; }
861 MotionRotationType motionRotationType() const { return rareNonInheritedData- >m_transform->m_motion.m_rotationType; } 862 MotionRotationType motionRotationType() const { return rareNonInheritedData- >m_transform->m_motion.m_rotationType; }
862 863
863 TextEmphasisFill textEmphasisFill() const { return static_cast<TextEmphasisF ill>(rareInheritedData->textEmphasisFill); } 864 TextEmphasisFill textEmphasisFill() const { return static_cast<TextEmphasisF ill>(rareInheritedData->textEmphasisFill); }
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
1341 void setHasInlineTransform(bool b) { SET_VAR(rareNonInheritedData, m_hasInli neTransform, b); } 1342 void setHasInlineTransform(bool b) { SET_VAR(rareNonInheritedData, m_hasInli neTransform, b); }
1342 void setHasCompositorProxy(bool b) { SET_VAR(rareNonInheritedData, m_hasComp ositorProxy, b); } 1343 void setHasCompositorProxy(bool b) { SET_VAR(rareNonInheritedData, m_hasComp ositorProxy, b); }
1343 void setTransform(const TransformOperations& ops) { SET_VAR(rareNonInherited Data.access()->m_transform, m_operations, ops); } 1344 void setTransform(const TransformOperations& ops) { SET_VAR(rareNonInherited Data.access()->m_transform, m_operations, ops); }
1344 void setTransformOriginX(const Length& v) { setTransformOrigin(TransformOrig in(v, transformOriginY(), transformOriginZ())); } 1345 void setTransformOriginX(const Length& v) { setTransformOrigin(TransformOrig in(v, transformOriginY(), transformOriginZ())); }
1345 void setTransformOriginY(const Length& v) { setTransformOrigin(TransformOrig in(transformOriginX(), v, transformOriginZ())); } 1346 void setTransformOriginY(const Length& v) { setTransformOrigin(TransformOrig in(transformOriginX(), v, transformOriginZ())); }
1346 void setTransformOriginZ(float f) { setTransformOrigin(TransformOrigin(trans formOriginX(), transformOriginY(), f)); } 1347 void setTransformOriginZ(float f) { setTransformOrigin(TransformOrigin(trans formOriginX(), transformOriginY(), f)); }
1347 void setTransformOrigin(const TransformOrigin& o) { SET_VAR(rareNonInherited Data.access()->m_transform, m_origin, o); } 1348 void setTransformOrigin(const TransformOrigin& o) { SET_VAR(rareNonInherited Data.access()->m_transform, m_origin, o); }
1348 void setTranslate(PassRefPtr<TranslateTransformOperation> v) { rareNonInheri tedData.access()->m_transform.access()->m_translate = v; } 1349 void setTranslate(PassRefPtr<TranslateTransformOperation> v) { rareNonInheri tedData.access()->m_transform.access()->m_translate = v; }
1349 void setRotate(PassRefPtr<RotateTransformOperation> v) { rareNonInheritedDat a.access()->m_transform.access()->m_rotate = v; } 1350 void setRotate(PassRefPtr<RotateTransformOperation> v) { rareNonInheritedDat a.access()->m_transform.access()->m_rotate = v; }
1350 void setScale(PassRefPtr<ScaleTransformOperation> v) { rareNonInheritedData. access()->m_transform.access()->m_scale = v; } 1351 void setScale(PassRefPtr<ScaleTransformOperation> v) { rareNonInheritedData. access()->m_transform.access()->m_scale = v; }
1351
Timothy Loh 2015/06/24 01:00:28 better to not touch random lines :/
1352 void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); } 1352 void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); }
1353 void setTextCombine(TextCombine v) { SET_VAR(rareNonInheritedData, m_textCom bine, v); } 1353 void setTextCombine(TextCombine v) { SET_VAR(rareNonInheritedData, m_textCom bine, v); }
1354 void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedD ata, m_textDecorationColor, c); } 1354 void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedD ata, m_textDecorationColor, c); }
1355 void setTextEmphasisColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInh eritedData, textEmphasisColor, setTextEmphasisColor, c); } 1355 void setTextEmphasisColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInh eritedData, textEmphasisColor, setTextEmphasisColor, c); }
1356 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); } 1356 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); }
1357 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); } 1357 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); }
1358 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); } 1358 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); }
1359 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); } 1359 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); }
1360 bool setTextOrientation(TextOrientation); 1360 bool setTextOrientation(TextOrientation);
1361 1361
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
1809 1809
1810 StyleColor decorationColorIncludingFallback(bool visitedLink) const; 1810 StyleColor decorationColorIncludingFallback(bool visitedLink) const;
1811 Color colorIncludingFallback(int colorProperty, bool visitedLink) const; 1811 Color colorIncludingFallback(int colorProperty, bool visitedLink) const;
1812 1812
1813 Color stopColor() const { return svgStyle().stopColor(); } 1813 Color stopColor() const { return svgStyle().stopColor(); }
1814 Color floodColor() const { return svgStyle().floodColor(); } 1814 Color floodColor() const { return svgStyle().floodColor(); }
1815 Color lightingColor() const { return svgStyle().lightingColor(); } 1815 Color lightingColor() const { return svgStyle().lightingColor(); }
1816 1816
1817 void appendContent(PassOwnPtr<ContentData>); 1817 void appendContent(PassOwnPtr<ContentData>);
1818 void addAppliedTextDecoration(const AppliedTextDecoration&); 1818 void addAppliedTextDecoration(const AppliedTextDecoration&);
1819 bool hasTransformOperations() const { return !rareNonInheritedData->m_transf orm->m_operations.operations().isEmpty(); }
alancutter (OOO until 2018) 2015/06/24 01:17:09 Does this file need to change?
1820 void applyMotionPathTransform(TransformationMatrix&) const; 1819 void applyMotionPathTransform(TransformationMatrix&) const;
1821 1820
1822 bool diffNeedsFullLayoutAndPaintInvalidation(const ComputedStyle& other) con st; 1821 bool diffNeedsFullLayoutAndPaintInvalidation(const ComputedStyle& other) con st;
1823 bool diffNeedsFullLayout(const ComputedStyle& other) const; 1822 bool diffNeedsFullLayout(const ComputedStyle& other) const;
1824 bool diffNeedsPaintInvalidationLayer(const ComputedStyle& other) const; 1823 bool diffNeedsPaintInvalidationLayer(const ComputedStyle& other) const;
1825 bool diffNeedsPaintInvalidationObject(const ComputedStyle& other) const; 1824 bool diffNeedsPaintInvalidationObject(const ComputedStyle& other) const;
1826 void updatePropertySpecificDifferences(const ComputedStyle& other, StyleDiff erence&) const; 1825 void updatePropertySpecificDifferences(const ComputedStyle& other, StyleDiff erence&) const;
1827 1826
1828 bool requireTransformOrigin(ApplyTransformOrigin applyOrigin, ApplyMotionPat h) const; 1827 bool requireTransformOrigin(ApplyTransformOrigin applyOrigin, ApplyMotionPat h) const;
1829 }; 1828 };
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1931 } 1930 }
1932 1931
1933 inline bool ComputedStyle::hasPseudoElementStyle() const 1932 inline bool ComputedStyle::hasPseudoElementStyle() const
1934 { 1933 {
1935 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1934 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1936 } 1935 }
1937 1936
1938 } // namespace blink 1937 } // namespace blink
1939 1938
1940 #endif // ComputedStyle_h 1939 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698