CSS Motion Path: New names for properties

third_party/WebKit/Source/core/style/ComputedStyle.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 26 matching lines @@
 #include "core/style/StyleBackgroundData.h"
 #include "core/style/StyleBoxData.h"
 #include "core/style/StyleContentAlignmentData.h"
 #include "core/style/StyleDeprecatedFlexibleBoxData.h"
 #include "core/style/StyleDifference.h"
 #include "core/style/StyleFilterData.h"
 #include "core/style/StyleFlexibleBoxData.h"
 #include "core/style/StyleGridData.h"
 #include "core/style/StyleGridItemData.h"
 #include "core/style/StyleInheritedData.h"
-#include "core/style/StyleMotionRotation.h"
 #include "core/style/StyleMultiColData.h"
+#include "core/style/StyleOffsetRotation.h"
 #include "core/style/StyleRareInheritedData.h"
 #include "core/style/StyleRareNonInheritedData.h"
 #include "core/style/StyleReflection.h"
 #include "core/style/StyleSelfAlignmentData.h"
 #include "core/style/StyleSurroundData.h"
 #include "core/style/StyleTransformData.h"
 #include "core/style/StyleVisualData.h"
 #include "core/style/StyleWillChangeData.h"
 #include "core/style/TransformOrigin.h"
 #include "platform/Length.h"
@@ skipping 904 matching lines @@
     // -webkit-margin-after-collapse (aka -webkit-margin-bottom-collapse)
     static EMarginCollapse initialMarginAfterCollapse() { return MarginCollapseCollapse; }
     EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCollapse>(m_rareNonInheritedData->marginBeforeCollapse); }
     void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(m_rareNonInheritedData, marginAfterCollapse, c); }
 
     // mix-blend-mode
     static WebBlendMode initialBlendMode() { return WebBlendModeNormal; }
     WebBlendMode blendMode() const { return static_cast<WebBlendMode>(m_rareNonInheritedData->m_effectiveBlendMode); }
     void setBlendMode(WebBlendMode v) { m_rareNonInheritedData.access()->m_effectiveBlendMode = v; }
 
-    // motion-path
-    static StylePath* initialMotionPath() { return nullptr; }
-    StylePath* motionPath() const { return m_rareNonInheritedData->m_transform->m_motion.m_path.get(); }
-    void setMotionPath(PassRefPtr<StylePath>);
-
-    // motion-offset
-    static Length initialMotionOffset() { return Length(0, Fixed); }
-    const Length& motionOffset() const { return m_rareNonInheritedData->m_transform->m_motion.m_offset; }
-    void setMotionOffset(const Length& motionOffset) { SET_NESTED_VAR(m_rareNonInheritedData, m_transform, m_motion.m_offset, motionOffset); }
-
-    // motion-rotation
-    static StyleMotionRotation initialMotionRotation() { return StyleMotionRotation(0, MotionRotationAuto); }
-    const StyleMotionRotation& motionRotation() const { return m_rareNonInheritedData->m_transform->m_motion.m_rotation; }
-    void setMotionRotation(const StyleMotionRotation& motionRotation) { SET_NESTED_VAR(m_rareNonInheritedData, m_transform, m_motion.m_rotation, motionRotation); }
-
     // object-fit
     static ObjectFit initialObjectFit() { return ObjectFitFill; }
     ObjectFit getObjectFit() const { return static_cast<ObjectFit>(m_rareNonInheritedData->m_objectFit); }
     void setObjectFit(ObjectFit f) { SET_VAR(m_rareNonInheritedData, m_objectFit, f); }
 
     // object-position
     static LengthPoint initialObjectPosition() { return LengthPoint(Length(50.0, Percent), Length(50.0, Percent)); }
     LengthPoint objectPosition() const { return m_rareNonInheritedData->m_objectPosition; }
     void setObjectPosition(LengthPoint position) { SET_VAR(m_rareNonInheritedData, m_objectPosition, position); }
 
+    // offset-distance
+    static Length initialOffsetDistance() { return Length(0, Fixed); }
+    const Length& offsetDistance() const { return m_rareNonInheritedData->m_transform->m_motion.m_distance; }
+    void setOffsetDistance(const Length& offsetDistance) { SET_NESTED_VAR(m_rareNonInheritedData, m_transform, m_motion.m_distance, offsetDistance); }
+
+    // offset-path
+    static StylePath* initialOffsetPath() { return nullptr; }
+    StylePath* offsetPath() const { return m_rareNonInheritedData->m_transform->m_motion.m_path.get(); }
+    void setOffsetPath(PassRefPtr<StylePath>);
+
+    // offset-rotation
+    static StyleOffsetRotation initialOffsetRotation() { return StyleOffsetRotation(0, OffsetRotationAuto); }
+    const StyleOffsetRotation& offsetRotation() const { return m_rareNonInheritedData->m_transform->m_motion.m_rotation; }
+    void setOffsetRotation(const StyleOffsetRotation& offsetRotation) { SET_NESTED_VAR(m_rareNonInheritedData, m_transform, m_motion.m_rotation, offsetRotation); }
+
     // opacity (aka -webkit-opacity)
     static float initialOpacity() { return 1.0f; }
     float opacity() const { return m_rareNonInheritedData->opacity; }
     void setOpacity(float f) { float v = clampTo<float>(f, 0, 1); SET_VAR(m_rareNonInheritedData, opacity, v); }
 
     // order (aka -webkit-order)
     static int initialOrder() { return 0; }
     int order() const { return m_rareNonInheritedData->m_order; }
     // We restrict the smallest value to int min + 2 because we use int min and int min + 1 as special values in a hash set.
     void setOrder(int o) { SET_VAR(m_rareNonInheritedData, m_order, max(std::numeric_limits<int>::min() + 2, o)); }
@@ skipping 1119 matching lines @@
     FloatRoundedRect getRoundedInnerBorderFor(const LayoutRect& borderRect,
         const LayoutRectOutsets insets, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const;
 
     // Float utility functions.
     bool isFloating() const { return m_nonInheritedData.m_floating != NoFloat; }
 
     // Mix-blend-mode utility functions.
     bool hasBlendMode() const { return blendMode() != WebBlendModeNormal; }
 
     // Motion utility functions.
-    bool hasMotionPath() const { return motionPath(); }
+    bool hasOffsetPath() const { return offsetPath(); }
 
     // Direction utility functions.
     bool isLeftToRightDirection() const { return direction() == LTR; }
 
     // Perspective utility functions.
     bool hasPerspective() const { return m_rareNonInheritedData->m_perspective > 0; }
 
     // Page size utility functions.
     void resetPageSizeType() { SET_VAR(m_rareNonInheritedData, m_pageSizeType, PAGE_SIZE_AUTO); }
 
@@ skipping 87 matching lines @@
     bool isRunningAnimationOnCompositor() const { return isRunningOpacityAnimationOnCompositor() || isRunningTransformAnimationOnCompositor() || isRunningFilterAnimationOnCompositor() || isRunningBackdropFilterAnimationOnCompositor(); }
 
     // Opacity utility functions.
     bool hasOpacity() const { return opacity() < 1.0f; }
 
     // Table layout utility functions.
     bool isFixedTableLayout() const { return tableLayout() == TableLayoutFixed && !logicalWidth().isAuto(); }
 
     // Filter/transform utility functions.
     bool has3DTransform() const { return m_rareNonInheritedData->m_transform->has3DTransform(); }
-    bool hasTransform() const { return hasTransformOperations() || hasMotionPath() || hasCurrentTransformAnimation() || translate() || rotate() || scale(); }
+    bool hasTransform() const { return hasTransformOperations() || hasOffsetPath() || hasCurrentTransformAnimation() || translate() || rotate() || scale(); }
     bool hasTransformOperations() const { return !m_rareNonInheritedData->m_transform->m_operations.operations().isEmpty(); }
     ETransformStyle3D usedTransformStyle3D() const { return hasGroupingProperty() ? TransformStyle3DFlat : transformStyle3D(); }
     bool transformDataEquivalent(const ComputedStyle& otherStyle) const { return m_rareNonInheritedData->m_transform == otherStyle.m_rareNonInheritedData->m_transform; }
     bool preserves3D() const { return usedTransformStyle3D() != TransformStyle3DFlat; }
     enum ApplyTransformOrigin { IncludeTransformOrigin, ExcludeTransformOrigin };
     enum ApplyMotionPath { IncludeMotionPath, ExcludeMotionPath };
     enum ApplyIndependentTransformProperties { IncludeIndependentTransformProperties , ExcludeIndependentTransformProperties };
     void applyTransform(TransformationMatrix&, const LayoutSize& borderBoxSize, ApplyTransformOrigin, ApplyMotionPath, ApplyIndependentTransformProperties) const;
     void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, ApplyTransformOrigin, ApplyMotionPath, ApplyIndependentTransformProperties) const;
 
@@ skipping 359 matching lines @@
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const
 {
     return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
 }
 
 } // namespace blink
 
 #endif // ComputedStyle_h