 Chromium Code Reviews
 Chromium Code Reviews Issue 1158603003:
  CSS Independent Transform Properties  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/blink.git@master
    
  
    Issue 1158603003:
  CSS Independent Transform Properties  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/blink.git@master| OLD | NEW | 
|---|---|
| 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 70 #include "platform/fonts/FontBaseline.h" | 70 #include "platform/fonts/FontBaseline.h" | 
| 71 #include "platform/fonts/FontDescription.h" | 71 #include "platform/fonts/FontDescription.h" | 
| 72 #include "platform/geometry/FloatRoundedRect.h" | 72 #include "platform/geometry/FloatRoundedRect.h" | 
| 73 #include "platform/geometry/LayoutRectOutsets.h" | 73 #include "platform/geometry/LayoutRectOutsets.h" | 
| 74 #include "platform/graphics/Color.h" | 74 #include "platform/graphics/Color.h" | 
| 75 #include "platform/graphics/GraphicsTypes.h" | 75 #include "platform/graphics/GraphicsTypes.h" | 
| 76 #include "platform/scroll/ScrollableArea.h" | 76 #include "platform/scroll/ScrollableArea.h" | 
| 77 #include "platform/text/TextDirection.h" | 77 #include "platform/text/TextDirection.h" | 
| 78 #include "platform/text/TextRun.h" | 78 #include "platform/text/TextRun.h" | 
| 79 #include "platform/text/UnicodeBidi.h" | 79 #include "platform/text/UnicodeBidi.h" | 
| 80 #include "platform/transforms/RotateTransformOperation.h" | |
| 81 #include "platform/transforms/ScaleTransformOperation.h" | |
| 80 #include "platform/transforms/TransformOperations.h" | 82 #include "platform/transforms/TransformOperations.h" | 
| 83 #include "platform/transforms/TranslateTransformOperation.h" | |
| 81 #include "public/platform/WebScrollBlocksOn.h" | 84 #include "public/platform/WebScrollBlocksOn.h" | 
| 82 #include "wtf/Forward.h" | 85 #include "wtf/Forward.h" | 
| 83 #include "wtf/OwnPtr.h" | 86 #include "wtf/OwnPtr.h" | 
| 84 #include "wtf/RefCounted.h" | 87 #include "wtf/RefCounted.h" | 
| 85 #include "wtf/StdLibExtras.h" | 88 #include "wtf/StdLibExtras.h" | 
| 86 #include "wtf/Vector.h" | 89 #include "wtf/Vector.h" | 
| 87 | 90 | 
| 88 template<typename T, typename U> inline bool compareEqual(const T& t, const U& u ) { return t == static_cast<T>(u); } | 91 template<typename T, typename U> inline bool compareEqual(const T& t, const U& u ) { return t == static_cast<T>(u); } | 
| 89 | 92 | 
| 90 #define SET_VAR(group, variable, value) \ | 93 #define SET_VAR(group, variable, value) \ | 
| (...skipping 745 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 836 ColumnSpan columnSpan() const { return static_cast<ColumnSpan>(rareNonInheri tedData->m_multiCol->m_columnSpan); } | 839 ColumnSpan columnSpan() const { return static_cast<ColumnSpan>(rareNonInheri tedData->m_multiCol->m_columnSpan); } | 
| 837 EPageBreak columnBreakBefore() const { return static_cast<EPageBreak>(rareNo nInheritedData->m_multiCol->m_breakBefore); } | 840 EPageBreak columnBreakBefore() const { return static_cast<EPageBreak>(rareNo nInheritedData->m_multiCol->m_breakBefore); } | 
| 838 EPageBreak columnBreakInside() const { return static_cast<EPageBreak>(rareNo nInheritedData->m_multiCol->m_breakInside); } | 841 EPageBreak columnBreakInside() const { return static_cast<EPageBreak>(rareNo nInheritedData->m_multiCol->m_breakInside); } | 
| 839 EPageBreak columnBreakAfter() const { return static_cast<EPageBreak>(rareNon InheritedData->m_multiCol->m_breakAfter); } | 842 EPageBreak columnBreakAfter() const { return static_cast<EPageBreak>(rareNon InheritedData->m_multiCol->m_breakAfter); } | 
| 840 bool hasInlineTransform() const { return rareNonInheritedData->m_hasInlineTr ansform; } | 843 bool hasInlineTransform() const { return rareNonInheritedData->m_hasInlineTr ansform; } | 
| 841 bool hasCompositorProxy() const { return rareNonInheritedData->m_hasComposit orProxy; } | 844 bool hasCompositorProxy() const { return rareNonInheritedData->m_hasComposit orProxy; } | 
| 842 const TransformOperations& transform() const { return rareNonInheritedData-> m_transform->m_operations; } | 845 const TransformOperations& transform() const { return rareNonInheritedData-> m_transform->m_operations; } | 
| 843 const TransformOrigin& transformOrigin() const { return rareNonInheritedData ->m_transform->m_origin; } | 846 const TransformOrigin& transformOrigin() const { return rareNonInheritedData ->m_transform->m_origin; } | 
| 844 const Length& transformOriginX() const { return transformOrigin().x(); } | 847 const Length& transformOriginX() const { return transformOrigin().x(); } | 
| 845 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(); } | |
| 850 RotateTransformOperation* rotate() const { return rareNonInheritedData->m_tr ansform->m_rotate.get(); } | |
| 851 ScaleTransformOperation* scale() const { return rareNonInheritedData->m_tran sform->m_scale.get(); } | |
| 846 float transformOriginZ() const { return transformOrigin().z(); } | 852 float transformOriginZ() const { return transformOrigin().z(); } | 
| 847 bool hasTransform() const { return hasTransformOperations() || hasMotionPath () || hasCurrentTransformAnimation(); } | 853 bool hasTranslateProperty() const { return rareNonInheritedData->m_transform ->m_translate; } | 
| 854 bool hasRotateProperty() const { return rareNonInheritedData->m_transform->m _rotate; } | |
| 855 bool hasScaleProperty() const { return rareNonInheritedData->m_transform->m_ scale; } | |
| 856 bool has3DTransformProperties() const { return rareNonInheritedData->m_trans form->has3DTransformProperties(); } | |
| 857 bool hasTransformProperties() const { return hasTranslateProperty() || hasRo tateProperty() || hasScaleProperty(); } | |
| 
dstockwell
2015/06/12 00:17:58
Confusing that it doesn't include the transform pr
 
soonm
2015/06/12 01:54:13
Merge this function into hasTransform()
 | |
| 858 bool hasTransform() const { return hasTransformOperations() || hasMotionPath () || hasCurrentTransformAnimation() || hasTransformProperties(); } | |
| 848 bool transformDataEquivalent(const ComputedStyle& otherStyle) const { return rareNonInheritedData->m_transform == otherStyle.rareNonInheritedData->m_transfo rm; } | 859 bool transformDataEquivalent(const ComputedStyle& otherStyle) const { return rareNonInheritedData->m_transform == otherStyle.rareNonInheritedData->m_transfo rm; } | 
| 849 | 860 | 
| 850 StyleMotionPath* motionPath() const { return rareNonInheritedData->m_transfo rm->m_motion.m_path.get(); } | 861 StyleMotionPath* motionPath() const { return rareNonInheritedData->m_transfo rm->m_motion.m_path.get(); } | 
| 851 bool hasMotionPath() const { return rareNonInheritedData->m_transform->m_mot ion.m_path; } | 862 bool hasMotionPath() const { return rareNonInheritedData->m_transform->m_mot ion.m_path; } | 
| 852 const Length& motionOffset() const { return rareNonInheritedData->m_transfor m->m_motion.m_offset; } | 863 const Length& motionOffset() const { return rareNonInheritedData->m_transfor m->m_motion.m_offset; } | 
| 853 float motionRotation() const { return rareNonInheritedData->m_transform->m_m otion.m_rotation; } | 864 float motionRotation() const { return rareNonInheritedData->m_transform->m_m otion.m_rotation; } | 
| 854 MotionRotationType motionRotationType() const { return rareNonInheritedData- >m_transform->m_motion.m_rotationType; } | 865 MotionRotationType motionRotationType() const { return rareNonInheritedData- >m_transform->m_motion.m_rotationType; } | 
| 855 | 866 | 
| 856 TextEmphasisFill textEmphasisFill() const { return static_cast<TextEmphasisF ill>(rareInheritedData->textEmphasisFill); } | 867 TextEmphasisFill textEmphasisFill() const { return static_cast<TextEmphasisF ill>(rareInheritedData->textEmphasisFill); } | 
| 857 TextEmphasisMark textEmphasisMark() const; | 868 TextEmphasisMark textEmphasisMark() const; | 
| 858 const AtomicString& textEmphasisCustomMark() const { return rareInheritedDat a->textEmphasisCustomMark; } | 869 const AtomicString& textEmphasisCustomMark() const { return rareInheritedDat a->textEmphasisCustomMark; } | 
| 859 TextEmphasisPosition textEmphasisPosition() const { return static_cast<TextE mphasisPosition>(rareInheritedData->textEmphasisPosition); } | 870 TextEmphasisPosition textEmphasisPosition() const { return static_cast<TextE mphasisPosition>(rareInheritedData->textEmphasisPosition); } | 
| 860 const AtomicString& textEmphasisMarkString() const; | 871 const AtomicString& textEmphasisMarkString() const; | 
| 861 | 872 | 
| 862 RubyPosition rubyPosition() const { return static_cast<RubyPosition>(rareInh eritedData->m_rubyPosition); } | 873 RubyPosition rubyPosition() const { return static_cast<RubyPosition>(rareInh eritedData->m_rubyPosition); } | 
| 863 | 874 | 
| 864 TextOrientation textOrientation() const { return static_cast<TextOrientation >(rareInheritedData->m_textOrientation); } | 875 TextOrientation textOrientation() const { return static_cast<TextOrientation >(rareInheritedData->m_textOrientation); } | 
| 865 | 876 | 
| 866 ObjectFit objectFit() const { return static_cast<ObjectFit>(rareNonInherited Data->m_objectFit); } | 877 ObjectFit objectFit() const { return static_cast<ObjectFit>(rareNonInherited Data->m_objectFit); } | 
| 867 LengthPoint objectPosition() const { return rareNonInheritedData->m_objectPo sition; } | 878 LengthPoint objectPosition() const { return rareNonInheritedData->m_objectPo sition; } | 
| 868 | 879 | 
| 869 // Return true if any transform related property (currently transform/motion Path, transformStyle3D or perspective) | 880 // Return true if any transform related property (currently transform/motion Path, transformStyle3D or perspective) | 
| 870 // indicates that we are transforming | 881 // indicates that we are transforming | 
| 871 bool hasTransformRelatedProperty() const { return hasTransform() || preserve s3D() || hasPerspective(); } | 882 bool hasTransformRelatedProperty() const { return hasTransform() || preserve s3D() || hasPerspective(); } | 
| 872 | 883 | 
| 873 enum ApplyTransformOrigin { IncludeTransformOrigin, ExcludeTransformOrigin } ; | 884 enum ApplyTransformOrigin { IncludeTransformOrigin, ExcludeTransformOrigin } ; | 
| 874 enum ApplyMotionPath { IncludeMotionPath, ExcludeMotionPath }; | 885 enum ApplyMotionPath { IncludeMotionPath, ExcludeMotionPath }; | 
| 875 void applyTransform(TransformationMatrix&, const LayoutSize& borderBoxSize, ApplyTransformOrigin = IncludeTransformOrigin, ApplyMotionPath = IncludeMotionPa th) const; | 886 enum ApplyTransformProperty { IncludeTransformProperty, ExcludeTransformProp erty }; | 
| 876 void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, App lyTransformOrigin = IncludeTransformOrigin, ApplyMotionPath = IncludeMotionPath) const; | 887 void applyTransform(TransformationMatrix&, const LayoutSize& borderBoxSize, ApplyTransformOrigin = IncludeTransformOrigin, ApplyMotionPath = IncludeMotionPa th, ApplyTransformProperty = IncludeTransformProperty) const; | 
| 888 void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, App lyTransformOrigin = IncludeTransformOrigin, ApplyMotionPath = IncludeMotionPath, ApplyTransformProperty = IncludeTransformProperty) const; | |
| 877 | 889 | 
| 878 bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rar eNonInheritedData->m_maskBoxImage.hasImage(); } | 890 bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rar eNonInheritedData->m_maskBoxImage.hasImage(); } | 
| 879 | 891 | 
| 880 TextCombine textCombine() const { return static_cast<TextCombine>(rareNonInh eritedData->m_textCombine); } | 892 TextCombine textCombine() const { return static_cast<TextCombine>(rareNonInh eritedData->m_textCombine); } | 
| 881 bool hasTextCombine() const { return textCombine() != TextCombineNone; } | 893 bool hasTextCombine() const { return textCombine() != TextCombineNone; } | 
| 882 | 894 | 
| 883 TabSize tabSize() const { return rareInheritedData->m_tabSize; } | 895 TabSize tabSize() const { return rareInheritedData->m_tabSize; } | 
| 884 | 896 | 
| 885 // End CSS3 Getters | 897 // End CSS3 Getters | 
| 886 | 898 | 
| (...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1331 void setColumnBreakInside(EPageBreak p) { ASSERT(p == PBAUTO || p == PBAVOID ); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_breakInside, p); } | 1343 void setColumnBreakInside(EPageBreak p) { ASSERT(p == PBAUTO || p == PBAVOID ); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_breakInside, p); } | 
| 1332 void setColumnBreakAfter(EPageBreak p) { SET_VAR(rareNonInheritedData.access ()->m_multiCol, m_breakAfter, p); } | 1344 void setColumnBreakAfter(EPageBreak p) { SET_VAR(rareNonInheritedData.access ()->m_multiCol, m_breakAfter, p); } | 
| 1333 void inheritColumnPropertiesFrom(const ComputedStyle& parent) { rareNonInher itedData.access()->m_multiCol = parent.rareNonInheritedData->m_multiCol; } | 1345 void inheritColumnPropertiesFrom(const ComputedStyle& parent) { rareNonInher itedData.access()->m_multiCol = parent.rareNonInheritedData->m_multiCol; } | 
| 1334 void setHasInlineTransform(bool b) { SET_VAR(rareNonInheritedData, m_hasInli neTransform, b); } | 1346 void setHasInlineTransform(bool b) { SET_VAR(rareNonInheritedData, m_hasInli neTransform, b); } | 
| 1335 void setHasCompositorProxy(bool b) { SET_VAR(rareNonInheritedData, m_hasComp ositorProxy, b); } | 1347 void setHasCompositorProxy(bool b) { SET_VAR(rareNonInheritedData, m_hasComp ositorProxy, b); } | 
| 1336 void setTransform(const TransformOperations& ops) { SET_VAR(rareNonInherited Data.access()->m_transform, m_operations, ops); } | 1348 void setTransform(const TransformOperations& ops) { SET_VAR(rareNonInherited Data.access()->m_transform, m_operations, ops); } | 
| 1337 void setTransformOriginX(const Length& v) { setTransformOrigin(TransformOrig in(v, transformOriginY(), transformOriginZ())); } | 1349 void setTransformOriginX(const Length& v) { setTransformOrigin(TransformOrig in(v, transformOriginY(), transformOriginZ())); } | 
| 1338 void setTransformOriginY(const Length& v) { setTransformOrigin(TransformOrig in(transformOriginX(), v, transformOriginZ())); } | 1350 void setTransformOriginY(const Length& v) { setTransformOrigin(TransformOrig in(transformOriginX(), v, transformOriginZ())); } | 
| 1339 void setTransformOriginZ(float f) { setTransformOrigin(TransformOrigin(trans formOriginX(), transformOriginY(), f)); } | 1351 void setTransformOriginZ(float f) { setTransformOrigin(TransformOrigin(trans formOriginX(), transformOriginY(), f)); } | 
| 1340 void setTransformOrigin(const TransformOrigin& o) { SET_VAR(rareNonInherited Data.access()->m_transform, m_origin, o); } | 1352 void setTransformOrigin(const TransformOrigin& o) { SET_VAR(rareNonInherited Data.access()->m_transform, m_origin, o); } | 
| 1353 void setTranslate(PassRefPtr<TranslateTransformOperation> v) { rareNonInheri tedData.access()->m_transform.access()->setTranslate(v); } | |
| 1354 void setRotate(PassRefPtr<RotateTransformOperation> v) { rareNonInheritedDat a.access()->m_transform.access()->setRotate(v); } | |
| 1355 void setScale(PassRefPtr<ScaleTransformOperation> v) { rareNonInheritedData. access()->m_transform.access()->setScale(v); } | |
| 1356 | |
| 1341 void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); } | 1357 void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); } | 
| 1342 void setTextCombine(TextCombine v) { SET_VAR(rareNonInheritedData, m_textCom bine, v); } | 1358 void setTextCombine(TextCombine v) { SET_VAR(rareNonInheritedData, m_textCom bine, v); } | 
| 1343 void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedD ata, m_textDecorationColor, c); } | 1359 void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedD ata, m_textDecorationColor, c); } | 
| 1344 void setTextEmphasisColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInh eritedData, textEmphasisColor, setTextEmphasisColor, c); } | 1360 void setTextEmphasisColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInh eritedData, textEmphasisColor, setTextEmphasisColor, c); } | 
| 1345 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); } | 1361 void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); } | 
| 1346 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); } | 1362 void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(rareInheritedData, textEmphasisMark, mark); } | 
| 1347 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); } | 1363 void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(rareInher itedData, textEmphasisCustomMark, mark); } | 
| 1348 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); } | 1364 void setTextEmphasisPosition(TextEmphasisPosition position) { SET_VAR(rareIn heritedData, textEmphasisPosition, position); } | 
| 1349 bool setTextOrientation(TextOrientation); | 1365 bool setTextOrientation(TextOrientation); | 
| 1350 | 1366 | 
| (...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1639 static const AtomicString& initialHyphenationString() { return nullAtom; } | 1655 static const AtomicString& initialHyphenationString() { return nullAtom; } | 
| 1640 static const AtomicString& initialLocale() { return nullAtom; } | 1656 static const AtomicString& initialLocale() { return nullAtom; } | 
| 1641 static EResize initialResize() { return RESIZE_NONE; } | 1657 static EResize initialResize() { return RESIZE_NONE; } | 
| 1642 static ControlPart initialAppearance() { return NoControlPart; } | 1658 static ControlPart initialAppearance() { return NoControlPart; } | 
| 1643 static Order initialRTLOrdering() { return LogicalOrder; } | 1659 static Order initialRTLOrdering() { return LogicalOrder; } | 
| 1644 static float initialTextStrokeWidth() { return 0; } | 1660 static float initialTextStrokeWidth() { return 0; } | 
| 1645 static unsigned short initialColumnCount() { return 1; } | 1661 static unsigned short initialColumnCount() { return 1; } | 
| 1646 static ColumnFill initialColumnFill() { return ColumnFillBalance; } | 1662 static ColumnFill initialColumnFill() { return ColumnFillBalance; } | 
| 1647 static ColumnSpan initialColumnSpan() { return ColumnSpanNone; } | 1663 static ColumnSpan initialColumnSpan() { return ColumnSpanNone; } | 
| 1648 static const TransformOperations& initialTransform() { DEFINE_STATIC_LOCAL(T ransformOperations, ops, ()); return ops; } | 1664 static const TransformOperations& initialTransform() { DEFINE_STATIC_LOCAL(T ransformOperations, ops, ()); return ops; } | 
| 1665 static const PassRefPtr<TranslateTransformOperation> initialTranslate() { re turn TranslateTransformOperation::create(Length(0, Fixed), Length(0, Fixed), 0, TransformOperation::Translate3D); } | |
| 1666 static const PassRefPtr<RotateTransformOperation> initialRotate() { return R otateTransformOperation::create(0, 0, 1, 0, TransformOperation::Rotate3D); } | |
| 1667 static const PassRefPtr<ScaleTransformOperation> initialScale() { return Sca leTransformOperation::create(1, 1, 1, TransformOperation::Scale3D); } | |
| 1649 static Length initialTransformOriginX() { return Length(50.0, Percent); } | 1668 static Length initialTransformOriginX() { return Length(50.0, Percent); } | 
| 1650 static Length initialTransformOriginY() { return Length(50.0, Percent); } | 1669 static Length initialTransformOriginY() { return Length(50.0, Percent); } | 
| 1651 static float initialTransformOriginZ() { return 0; } | 1670 static float initialTransformOriginZ() { return 0; } | 
| 1652 static TransformOrigin initialTransformOrigin() { return TransformOrigin(Len gth(50.0, Percent), Length(50.0, Percent), 0); } | 1671 static TransformOrigin initialTransformOrigin() { return TransformOrigin(Len gth(50.0, Percent), Length(50.0, Percent), 0); } | 
| 1653 static EPointerEvents initialPointerEvents() { return PE_AUTO; } | 1672 static EPointerEvents initialPointerEvents() { return PE_AUTO; } | 
| 1654 static ETransformStyle3D initialTransformStyle3D() { return TransformStyle3D Flat; } | 1673 static ETransformStyle3D initialTransformStyle3D() { return TransformStyle3D Flat; } | 
| 1655 static const StyleMotionPath* initialMotionPath() { return nullptr; } | 1674 static const StyleMotionPath* initialMotionPath() { return nullptr; } | 
| 1656 static Length initialMotionOffset() { return Length(0, Fixed); } | 1675 static Length initialMotionOffset() { return Length(0, Fixed); } | 
| 1657 static float initialMotionRotation() { return 0; } | 1676 static float initialMotionRotation() { return 0; } | 
| 1658 static MotionRotationType initialMotionRotationType() { return MotionRotatio nAuto; } | 1677 static MotionRotationType initialMotionRotationType() { return MotionRotatio nAuto; } | 
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1803 void appendContent(PassOwnPtr<ContentData>); | 1822 void appendContent(PassOwnPtr<ContentData>); | 
| 1804 void addAppliedTextDecoration(const AppliedTextDecoration&); | 1823 void addAppliedTextDecoration(const AppliedTextDecoration&); | 
| 1805 bool hasTransformOperations() const { return !rareNonInheritedData->m_transf orm->m_operations.operations().isEmpty(); } | 1824 bool hasTransformOperations() const { return !rareNonInheritedData->m_transf orm->m_operations.operations().isEmpty(); } | 
| 1806 void applyMotionPathTransform(TransformationMatrix&) const; | 1825 void applyMotionPathTransform(TransformationMatrix&) const; | 
| 1807 | 1826 | 
| 1808 bool diffNeedsFullLayoutAndPaintInvalidation(const ComputedStyle& other) con st; | 1827 bool diffNeedsFullLayoutAndPaintInvalidation(const ComputedStyle& other) con st; | 
| 1809 bool diffNeedsFullLayout(const ComputedStyle& other) const; | 1828 bool diffNeedsFullLayout(const ComputedStyle& other) const; | 
| 1810 bool diffNeedsPaintInvalidationLayer(const ComputedStyle& other) const; | 1829 bool diffNeedsPaintInvalidationLayer(const ComputedStyle& other) const; | 
| 1811 bool diffNeedsPaintInvalidationObject(const ComputedStyle& other) const; | 1830 bool diffNeedsPaintInvalidationObject(const ComputedStyle& other) const; | 
| 1812 void updatePropertySpecificDifferences(const ComputedStyle& other, StyleDiff erence&) const; | 1831 void updatePropertySpecificDifferences(const ComputedStyle& other, StyleDiff erence&) const; | 
| 1832 | |
| 1833 bool requireTransformOrigin(ApplyTransformOrigin applyOrigin, ApplyMotionPat h) const; | |
| 1813 }; | 1834 }; | 
| 1814 | 1835 | 
| 1815 // FIXME: Reduce/remove the dependency on zoom adjusted int values. | 1836 // FIXME: Reduce/remove the dependency on zoom adjusted int values. | 
| 1816 // The float or LayoutUnit versions of layout values should be used. | 1837 // The float or LayoutUnit versions of layout values should be used. | 
| 1817 inline int adjustForAbsoluteZoom(int value, float zoomFactor) | 1838 inline int adjustForAbsoluteZoom(int value, float zoomFactor) | 
| 1818 { | 1839 { | 
| 1819 if (zoomFactor == 1) | 1840 if (zoomFactor == 1) | 
| 1820 return value; | 1841 return value; | 
| 1821 // Needed because computeLengthInt truncates (rather than rounds) when scali ng up. | 1842 // Needed because computeLengthInt truncates (rather than rounds) when scali ng up. | 
| 1822 float fvalue = value; | 1843 float fvalue = value; | 
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1915 } | 1936 } | 
| 1916 | 1937 | 
| 1917 inline bool ComputedStyle::hasPseudoElementStyle() const | 1938 inline bool ComputedStyle::hasPseudoElementStyle() const | 
| 1918 { | 1939 { | 
| 1919 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; | 1940 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; | 
| 1920 } | 1941 } | 
| 1921 | 1942 | 
| 1922 } // namespace blink | 1943 } // namespace blink | 
| 1923 | 1944 | 
| 1924 #endif // ComputedStyle_h | 1945 #endif // ComputedStyle_h | 
| OLD | NEW |