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

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

Issue 1218943002: Compositor animations for Independent CSS Transform Properties (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add Manual Tests and fix bug with cancel tests Created 5 years, 5 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 | « Source/core/animation/KeyframeEffectModel.cpp ('k') | no next file » | 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) 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 834 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 hasTransform() const { return hasTransformOperations() || hasMotionPath () || hasCurrentTransformAnimation() || translate() || rotate() || scale(); } 854 bool hasTransform() const { return hasTransformOperations() || hasMotionPath () || hasCurrentTransformAnimation() || translate() || rotate() || scale(); }
855 bool hasTransformOperations() const { return !rareNonInheritedData->m_transf orm->m_operations.operations().isEmpty(); }
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); }
864 TextEmphasisMark textEmphasisMark() const; 865 TextEmphasisMark textEmphasisMark() const;
(...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after
1651 static const AtomicString& initialHyphenationString() { return nullAtom; } 1652 static const AtomicString& initialHyphenationString() { return nullAtom; }
1652 static const AtomicString& initialLocale() { return nullAtom; } 1653 static const AtomicString& initialLocale() { return nullAtom; }
1653 static EResize initialResize() { return RESIZE_NONE; } 1654 static EResize initialResize() { return RESIZE_NONE; }
1654 static ControlPart initialAppearance() { return NoControlPart; } 1655 static ControlPart initialAppearance() { return NoControlPart; }
1655 static Order initialRTLOrdering() { return LogicalOrder; } 1656 static Order initialRTLOrdering() { return LogicalOrder; }
1656 static float initialTextStrokeWidth() { return 0; } 1657 static float initialTextStrokeWidth() { return 0; }
1657 static unsigned short initialColumnCount() { return 1; } 1658 static unsigned short initialColumnCount() { return 1; }
1658 static ColumnFill initialColumnFill() { return ColumnFillBalance; } 1659 static ColumnFill initialColumnFill() { return ColumnFillBalance; }
1659 static ColumnSpan initialColumnSpan() { return ColumnSpanNone; } 1660 static ColumnSpan initialColumnSpan() { return ColumnSpanNone; }
1660 static const TransformOperations& initialTransform() { DEFINE_STATIC_LOCAL(T ransformOperations, ops, ()); return ops; } 1661 static const TransformOperations& initialTransform() { DEFINE_STATIC_LOCAL(T ransformOperations, ops, ()); return ops; }
1661 static PassRefPtr<TranslateTransformOperation> initialTranslate() { return n ullptr; } 1662 static PassRefPtr<TranslateTransformOperation> initialTranslate() { return T ranslateTransformOperation::create(Length(0, Fixed), Length(0, Fixed), 0, Transf ormOperation::Translate3D); }
1662 static PassRefPtr<RotateTransformOperation> initialRotate() { return nullptr ; } 1663 static PassRefPtr<RotateTransformOperation> initialRotate() { return RotateT ransformOperation::create(0, 0, 1, 0, TransformOperation::Rotate3D); }
1663 static PassRefPtr<ScaleTransformOperation> initialScale() { return nullptr; } 1664 static PassRefPtr<ScaleTransformOperation> initialScale() { return ScaleTran sformOperation::create(1, 1, 1, TransformOperation::Scale3D); }
1664 static Length initialTransformOriginX() { return Length(50.0, Percent); } 1665 static Length initialTransformOriginX() { return Length(50.0, Percent); }
1665 static Length initialTransformOriginY() { return Length(50.0, Percent); } 1666 static Length initialTransformOriginY() { return Length(50.0, Percent); }
1666 static float initialTransformOriginZ() { return 0; } 1667 static float initialTransformOriginZ() { return 0; }
1667 static TransformOrigin initialTransformOrigin() { return TransformOrigin(Len gth(50.0, Percent), Length(50.0, Percent), 0); } 1668 static TransformOrigin initialTransformOrigin() { return TransformOrigin(Len gth(50.0, Percent), Length(50.0, Percent), 0); }
1668 static EPointerEvents initialPointerEvents() { return PE_AUTO; } 1669 static EPointerEvents initialPointerEvents() { return PE_AUTO; }
1669 static ETransformStyle3D initialTransformStyle3D() { return TransformStyle3D Flat; } 1670 static ETransformStyle3D initialTransformStyle3D() { return TransformStyle3D Flat; }
1670 static const StyleMotionPath* initialMotionPath() { return nullptr; } 1671 static const StyleMotionPath* initialMotionPath() { return nullptr; }
1671 static Length initialMotionOffset() { return Length(0, Fixed); } 1672 static Length initialMotionOffset() { return Length(0, Fixed); }
1672 static float initialMotionRotation() { return 0; } 1673 static float initialMotionRotation() { return 0; }
1673 static MotionRotationType initialMotionRotationType() { return MotionRotatio nAuto; } 1674 static MotionRotationType initialMotionRotationType() { return MotionRotatio nAuto; }
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
1810 1811
1811 StyleColor decorationColorIncludingFallback(bool visitedLink) const; 1812 StyleColor decorationColorIncludingFallback(bool visitedLink) const;
1812 Color colorIncludingFallback(int colorProperty, bool visitedLink) const; 1813 Color colorIncludingFallback(int colorProperty, bool visitedLink) const;
1813 1814
1814 Color stopColor() const { return svgStyle().stopColor(); } 1815 Color stopColor() const { return svgStyle().stopColor(); }
1815 Color floodColor() const { return svgStyle().floodColor(); } 1816 Color floodColor() const { return svgStyle().floodColor(); }
1816 Color lightingColor() const { return svgStyle().lightingColor(); } 1817 Color lightingColor() const { return svgStyle().lightingColor(); }
1817 1818
1818 void appendContent(PassOwnPtr<ContentData>); 1819 void appendContent(PassOwnPtr<ContentData>);
1819 void addAppliedTextDecoration(const AppliedTextDecoration&); 1820 void addAppliedTextDecoration(const AppliedTextDecoration&);
1820 bool hasTransformOperations() const { return !rareNonInheritedData->m_transf orm->m_operations.operations().isEmpty(); }
1821 void applyMotionPathTransform(TransformationMatrix&) const; 1821 void applyMotionPathTransform(TransformationMatrix&) const;
1822 1822
1823 bool diffNeedsFullLayoutAndPaintInvalidation(const ComputedStyle& other) con st; 1823 bool diffNeedsFullLayoutAndPaintInvalidation(const ComputedStyle& other) con st;
1824 bool diffNeedsFullLayout(const ComputedStyle& other) const; 1824 bool diffNeedsFullLayout(const ComputedStyle& other) const;
1825 bool diffNeedsPaintInvalidationLayer(const ComputedStyle& other) const; 1825 bool diffNeedsPaintInvalidationLayer(const ComputedStyle& other) const;
1826 bool diffNeedsPaintInvalidationObject(const ComputedStyle& other) const; 1826 bool diffNeedsPaintInvalidationObject(const ComputedStyle& other) const;
1827 void updatePropertySpecificDifferences(const ComputedStyle& other, StyleDiff erence&) const; 1827 void updatePropertySpecificDifferences(const ComputedStyle& other, StyleDiff erence&) const;
1828 1828
1829 bool requireTransformOrigin(ApplyTransformOrigin applyOrigin, ApplyMotionPat h) const; 1829 bool requireTransformOrigin(ApplyTransformOrigin applyOrigin, ApplyMotionPat h) const;
1830 }; 1830 };
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
1935 } 1935 }
1936 1936
1937 inline bool ComputedStyle::hasPseudoElementStyle() const 1937 inline bool ComputedStyle::hasPseudoElementStyle() const
1938 { 1938 {
1939 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1939 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1940 } 1940 }
1941 1941
1942 } // namespace blink 1942 } // namespace blink
1943 1943
1944 #endif // ComputedStyle_h 1944 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « Source/core/animation/KeyframeEffectModel.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698