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

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

Issue 1649003002: Use StylePath instead of (Path)StyleMotionPath (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 10 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "core/style/StyleBackgroundData.h" 42 #include "core/style/StyleBackgroundData.h"
43 #include "core/style/StyleBoxData.h" 43 #include "core/style/StyleBoxData.h"
44 #include "core/style/StyleContentAlignmentData.h" 44 #include "core/style/StyleContentAlignmentData.h"
45 #include "core/style/StyleDeprecatedFlexibleBoxData.h" 45 #include "core/style/StyleDeprecatedFlexibleBoxData.h"
46 #include "core/style/StyleDifference.h" 46 #include "core/style/StyleDifference.h"
47 #include "core/style/StyleFilterData.h" 47 #include "core/style/StyleFilterData.h"
48 #include "core/style/StyleFlexibleBoxData.h" 48 #include "core/style/StyleFlexibleBoxData.h"
49 #include "core/style/StyleGridData.h" 49 #include "core/style/StyleGridData.h"
50 #include "core/style/StyleGridItemData.h" 50 #include "core/style/StyleGridItemData.h"
51 #include "core/style/StyleInheritedData.h" 51 #include "core/style/StyleInheritedData.h"
52 #include "core/style/StyleMotionPath.h"
53 #include "core/style/StyleMotionRotation.h" 52 #include "core/style/StyleMotionRotation.h"
54 #include "core/style/StyleMultiColData.h" 53 #include "core/style/StyleMultiColData.h"
55 #include "core/style/StyleRareInheritedData.h" 54 #include "core/style/StyleRareInheritedData.h"
56 #include "core/style/StyleRareNonInheritedData.h" 55 #include "core/style/StyleRareNonInheritedData.h"
57 #include "core/style/StyleReflection.h" 56 #include "core/style/StyleReflection.h"
58 #include "core/style/StyleScrollSnapData.h" 57 #include "core/style/StyleScrollSnapData.h"
59 #include "core/style/StyleSelfAlignmentData.h" 58 #include "core/style/StyleSelfAlignmentData.h"
60 #include "core/style/StyleSurroundData.h" 59 #include "core/style/StyleSurroundData.h"
61 #include "core/style/StyleTransformData.h" 60 #include "core/style/StyleTransformData.h"
62 #include "core/style/StyleVisualData.h" 61 #include "core/style/StyleVisualData.h"
(...skipping 826 matching lines...) Expand 10 before | Expand all | Expand 10 after
889 const Length& transformOriginY() const { return transformOrigin().y(); } 888 const Length& transformOriginY() const { return transformOrigin().y(); }
890 TranslateTransformOperation* translate() const { return rareNonInheritedData ->m_transform->m_translate.get(); } 889 TranslateTransformOperation* translate() const { return rareNonInheritedData ->m_transform->m_translate.get(); }
891 RotateTransformOperation* rotate() const { return rareNonInheritedData->m_tr ansform->m_rotate.get(); } 890 RotateTransformOperation* rotate() const { return rareNonInheritedData->m_tr ansform->m_rotate.get(); }
892 ScaleTransformOperation* scale() const { return rareNonInheritedData->m_tran sform->m_scale.get(); } 891 ScaleTransformOperation* scale() const { return rareNonInheritedData->m_tran sform->m_scale.get(); }
893 float transformOriginZ() const { return transformOrigin().z(); } 892 float transformOriginZ() const { return transformOrigin().z(); }
894 bool has3DTransform() const { return rareNonInheritedData->m_transform->has3 DTransform(); } 893 bool has3DTransform() const { return rareNonInheritedData->m_transform->has3 DTransform(); }
895 bool hasTransform() const { return hasTransformOperations() || hasMotionPath () || hasCurrentTransformAnimation() || translate() || rotate() || scale(); } 894 bool hasTransform() const { return hasTransformOperations() || hasMotionPath () || hasCurrentTransformAnimation() || translate() || rotate() || scale(); }
896 bool hasTransformOperations() const { return !rareNonInheritedData->m_transf orm->m_operations.operations().isEmpty(); } 895 bool hasTransformOperations() const { return !rareNonInheritedData->m_transf orm->m_operations.operations().isEmpty(); }
897 bool transformDataEquivalent(const ComputedStyle& otherStyle) const { return rareNonInheritedData->m_transform == otherStyle.rareNonInheritedData->m_transfo rm; } 896 bool transformDataEquivalent(const ComputedStyle& otherStyle) const { return rareNonInheritedData->m_transform == otherStyle.rareNonInheritedData->m_transfo rm; }
898 897
899 StyleMotionPath* motionPath() const { return rareNonInheritedData->m_transfo rm->m_motion.m_path.get(); } 898 StylePath* motionPath() const { return rareNonInheritedData->m_transform->m_ motion.m_path.get(); }
900 bool hasMotionPath() const { return rareNonInheritedData->m_transform->m_mot ion.m_path; } 899 bool hasMotionPath() const { return rareNonInheritedData->m_transform->m_mot ion.m_path; }
901 const Length& motionOffset() const { return rareNonInheritedData->m_transfor m->m_motion.m_offset; } 900 const Length& motionOffset() const { return rareNonInheritedData->m_transfor m->m_motion.m_offset; }
902 const StyleMotionRotation& motionRotation() const { return rareNonInheritedD ata->m_transform->m_motion.m_rotation; } 901 const StyleMotionRotation& motionRotation() const { return rareNonInheritedD ata->m_transform->m_motion.m_rotation; }
903 902
904 TextEmphasisFill textEmphasisFill() const { return static_cast<TextEmphasisF ill>(rareInheritedData->textEmphasisFill); } 903 TextEmphasisFill textEmphasisFill() const { return static_cast<TextEmphasisF ill>(rareInheritedData->textEmphasisFill); }
905 TextEmphasisMark textEmphasisMark() const; 904 TextEmphasisMark textEmphasisMark() const;
906 const AtomicString& textEmphasisCustomMark() const { return rareInheritedDat a->textEmphasisCustomMark; } 905 const AtomicString& textEmphasisCustomMark() const { return rareInheritedDat a->textEmphasisCustomMark; }
907 TextEmphasisPosition textEmphasisPosition() const { return static_cast<TextE mphasisPosition>(rareInheritedData->textEmphasisPosition); } 906 TextEmphasisPosition textEmphasisPosition() const { return static_cast<TextE mphasisPosition>(rareInheritedData->textEmphasisPosition); }
908 const AtomicString& textEmphasisMarkString() const; 907 const AtomicString& textEmphasisMarkString() const;
909 908
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
1416 void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); } 1415 void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); }
1417 void setTextCombine(TextCombine v) { SET_VAR(rareInheritedData, m_textCombin e, v); } 1416 void setTextCombine(TextCombine v) { SET_VAR(rareInheritedData, m_textCombin e, v); }
1418 void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedD ata, m_textDecorationColor, c); } 1417 void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedD ata, m_textDecorationColor, c); }
1419 void setTextEmphasisColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInh eritedData, textEmphasisColor, setTextEmphasisColor, c); } 1418 void setTextEmphasisColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInh eritedData, textEmphasisColor, setTextEmphasisColor, c); }
1420 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); } 1419 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); }
1421 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); } 1420 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); }
1422 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); } 1421 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); }
1423 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); } 1422 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); }
1424 bool setTextOrientation(TextOrientation); 1423 bool setTextOrientation(TextOrientation);
1425 1424
1426 void setMotionPath(PassRefPtr<StyleMotionPath>); 1425 void setMotionPath(PassRefPtr<StylePath>);
1427 void resetMotionPath();
1428 void setMotionOffset(const Length& motionOffset) { SET_NESTED_VAR(rareNonInh eritedData, m_transform, m_motion.m_offset, motionOffset); } 1426 void setMotionOffset(const Length& motionOffset) { SET_NESTED_VAR(rareNonInh eritedData, m_transform, m_motion.m_offset, motionOffset); }
1429 void setMotionRotation(const StyleMotionRotation& motionRotation) { SET_NEST ED_VAR(rareNonInheritedData, m_transform, m_motion.m_rotation, motionRotation); } 1427 void setMotionRotation(const StyleMotionRotation& motionRotation) { SET_NEST ED_VAR(rareNonInheritedData, m_transform, m_motion.m_rotation, motionRotation); }
1430 1428
1431 void setObjectFit(ObjectFit f) { SET_VAR(rareNonInheritedData, m_objectFit, f); } 1429 void setObjectFit(ObjectFit f) { SET_VAR(rareNonInheritedData, m_objectFit, f); }
1432 void setObjectPosition(LengthPoint position) { SET_VAR(rareNonInheritedData, m_objectPosition, position); } 1430 void setObjectPosition(LengthPoint position) { SET_VAR(rareNonInheritedData, m_objectPosition, position); }
1433 1431
1434 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); } 1432 void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_r ubyPosition, position); }
1435 1433
1436 void setFilter(const FilterOperations& ops) { SET_NESTED_VAR(rareNonInherite dData, m_filter, m_operations, ops); } 1434 void setFilter(const FilterOperations& ops) { SET_NESTED_VAR(rareNonInherite dData, m_filter, m_operations, ops); }
1437 void setBackdropFilter(const FilterOperations& ops) { SET_NESTED_VAR(rareNon InheritedData, m_backdropFilter, m_operations, ops); } 1435 void setBackdropFilter(const FilterOperations& ops) { SET_NESTED_VAR(rareNon InheritedData, m_backdropFilter, m_operations, ops); }
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
1740 static EmptyTransformOperations initialTransform() { return EmptyTransformOp erations(); } 1738 static EmptyTransformOperations initialTransform() { return EmptyTransformOp erations(); }
1741 static PassRefPtr<TranslateTransformOperation> initialTranslate() { return T ranslateTransformOperation::create(Length(0, Fixed), Length(0, Fixed), 0, Transf ormOperation::Translate3D); } 1739 static PassRefPtr<TranslateTransformOperation> initialTranslate() { return T ranslateTransformOperation::create(Length(0, Fixed), Length(0, Fixed), 0, Transf ormOperation::Translate3D); }
1742 static PassRefPtr<RotateTransformOperation> initialRotate() { return RotateT ransformOperation::create(0, 0, 1, 0, TransformOperation::Rotate3D); } 1740 static PassRefPtr<RotateTransformOperation> initialRotate() { return RotateT ransformOperation::create(0, 0, 1, 0, TransformOperation::Rotate3D); }
1743 static PassRefPtr<ScaleTransformOperation> initialScale() { return ScaleTran sformOperation::create(1, 1, 1, TransformOperation::Scale3D); } 1741 static PassRefPtr<ScaleTransformOperation> initialScale() { return ScaleTran sformOperation::create(1, 1, 1, TransformOperation::Scale3D); }
1744 static Length initialTransformOriginX() { return Length(50.0, Percent); } 1742 static Length initialTransformOriginX() { return Length(50.0, Percent); }
1745 static Length initialTransformOriginY() { return Length(50.0, Percent); } 1743 static Length initialTransformOriginY() { return Length(50.0, Percent); }
1746 static float initialTransformOriginZ() { return 0; } 1744 static float initialTransformOriginZ() { return 0; }
1747 static TransformOrigin initialTransformOrigin() { return TransformOrigin(Len gth(50.0, Percent), Length(50.0, Percent), 0); } 1745 static TransformOrigin initialTransformOrigin() { return TransformOrigin(Len gth(50.0, Percent), Length(50.0, Percent), 0); }
1748 static EPointerEvents initialPointerEvents() { return PE_AUTO; } 1746 static EPointerEvents initialPointerEvents() { return PE_AUTO; }
1749 static ETransformStyle3D initialTransformStyle3D() { return TransformStyle3D Flat; } 1747 static ETransformStyle3D initialTransformStyle3D() { return TransformStyle3D Flat; }
1750 static const StyleMotionPath* initialMotionPath() { return nullptr; } 1748 static StylePath* initialMotionPath() { return nullptr; }
1751 static Length initialMotionOffset() { return Length(0, Fixed); } 1749 static Length initialMotionOffset() { return Length(0, Fixed); }
1752 static StyleMotionRotation initialMotionRotation() { return StyleMotionRotat ion(0, MotionRotationAuto); } 1750 static StyleMotionRotation initialMotionRotation() { return StyleMotionRotat ion(0, MotionRotationAuto); }
1753 static EBackfaceVisibility initialBackfaceVisibility() { return BackfaceVisi bilityVisible; } 1751 static EBackfaceVisibility initialBackfaceVisibility() { return BackfaceVisi bilityVisible; }
1754 static float initialPerspective() { return 0; } 1752 static float initialPerspective() { return 0; }
1755 static Length initialPerspectiveOriginX() { return Length(50.0, Percent); } 1753 static Length initialPerspectiveOriginX() { return Length(50.0, Percent); }
1756 static Length initialPerspectiveOriginY() { return Length(50.0, Percent); } 1754 static Length initialPerspectiveOriginY() { return Length(50.0, Percent); }
1757 static LengthPoint initialPerspectiveOrigin() { return LengthPoint(Length(50 .0, Percent), Length(50.0, Percent)); } 1755 static LengthPoint initialPerspectiveOrigin() { return LengthPoint(Length(50 .0, Percent), Length(50.0, Percent)); }
1758 static Color initialBackgroundColor() { return Color::transparent; } 1756 static Color initialBackgroundColor() { return Color::transparent; }
1759 static TextEmphasisFill initialTextEmphasisFill() { return TextEmphasisFillF illed; } 1757 static TextEmphasisFill initialTextEmphasisFill() { return TextEmphasisFillF illed; }
1760 static TextEmphasisMark initialTextEmphasisMark() { return TextEmphasisMarkN one; } 1758 static TextEmphasisMark initialTextEmphasisMark() { return TextEmphasisMarkN one; }
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
2019 } 2017 }
2020 2018
2021 inline bool ComputedStyle::hasPseudoElementStyle() const 2019 inline bool ComputedStyle::hasPseudoElementStyle() const
2022 { 2020 {
2023 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 2021 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
2024 } 2022 }
2025 2023
2026 } // namespace blink 2024 } // namespace blink
2027 2025
2028 #endif // ComputedStyle_h 2026 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698