[WIP] CSS Motion Path: offset shorthand ready for position and anchor

third_party/WebKit/Source/core/css/StylePropertySerializer.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * 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
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
 */
 
 #include "core/css/StylePropertySerializer.h"
 
 #include "core/CSSValueKeywords.h"
 #include "core/StylePropertyShorthand.h"
 #include "core/css/CSSCustomPropertyDeclaration.h"
 #include "core/css/CSSPendingSubstitutionValue.h"
 #include "core/css/CSSPropertyMetadata.h"
+#include "core/css/CSSValuePair.h"
 #include "core/css/CSSValuePool.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/text/StringBuilder.h"
 #include <bitset>
 
 namespace blink {
 
 StylePropertySerializer::StylePropertySetForSerializer::StylePropertySetForSerializer(const StylePropertySet& properties)
     : m_propertySet(&properties)
     , m_allIndex(m_propertySet->findPropertyIndex(CSSPropertyAll))
@@ skipping 410 matching lines @@
         return getShorthandValue(gridGapShorthand());
     case CSSPropertyFont:
         return fontValue();
     case CSSPropertyFontVariant:
         return fontVariantValue();
     case CSSPropertyMargin:
         return get4Values(marginShorthand());
     case CSSPropertyMotion:
         return getShorthandValue(motionShorthand());
     case CSSPropertyOffset:
-        return getShorthandValue(offsetShorthand());
+        return offsetValue();
     case CSSPropertyWebkitMarginCollapse:
         return getShorthandValue(webkitMarginCollapseShorthand());
     case CSSPropertyOverflow:
         return getCommonValue(overflowShorthand());
     case CSSPropertyPadding:
         return get4Values(paddingShorthand());
     case CSSPropertyTransition:
         return getLayeredShorthandValue(transitionShorthand());
     case CSSPropertyListStyle:
         return getShorthandValue(listStyleShorthand());
@@ skipping 68 matching lines @@
         && val->isPrimitiveValue()
         && toCSSPrimitiveValue(val)->getValueID() == CSSValueNone) {
         value = "no-common-ligatures no-discretionary-ligatures no-historical-ligatures no-contextual";
     } else {
         value = m_propertySet.propertyAt(foundPropertyIndex).value()->cssText();
     }
 
     result.append(value);
 }
 
+String StylePropertySerializer::offsetValue() const

[Timothy Loh, 2016/09/27 08:17:48]

This is going to do the wrong thing when the anchor/position properties aren't
enabled.

[Eric Willigers, 2016/09/29 03:53:18]

Now changed to never read them if not enabled.

+{
+    int offsetPositionPropertyIndex = m_propertySet.findPropertyIndex(CSSPropertyOffsetPosition);
+    int offsetPathPropertyIndex = m_propertySet.findPropertyIndex(CSSPropertyOffsetPath);
+    int offsetDistancePropertyIndex = m_propertySet.findPropertyIndex(CSSPropertyOffsetDistance);
+    int offsetRotationPropertyIndex = m_propertySet.findPropertyIndex(CSSPropertyOffsetRotation);
+    int offsetAnchorPropertyIndex = m_propertySet.findPropertyIndex(CSSPropertyOffsetAnchor);
+    DCHECK_NE(offsetPositionPropertyIndex, -1);
+    DCHECK_NE(offsetPathPropertyIndex, -1);
+    DCHECK_NE(offsetDistancePropertyIndex, -1);
+    DCHECK_NE(offsetRotationPropertyIndex, -1);
+    DCHECK_NE(offsetAnchorPropertyIndex, -1);
+
+    PropertyValueForSerializer offsetPositionProperty = m_propertySet.propertyAt(offsetPositionPropertyIndex);
+    PropertyValueForSerializer offsetPathProperty = m_propertySet.propertyAt(offsetPathPropertyIndex);
+    PropertyValueForSerializer offsetDistanceProperty = m_propertySet.propertyAt(offsetDistancePropertyIndex);
+    PropertyValueForSerializer offsetRotationProperty = m_propertySet.propertyAt(offsetRotationPropertyIndex);
+    PropertyValueForSerializer offsetAnchorProperty = m_propertySet.propertyAt(offsetAnchorPropertyIndex);
+
+    const CSSValue* offsetPositionValue = offsetPositionProperty.value();

[Timothy Loh, 2016/09/27 08:17:48]

= m_propertySet.getPropertyCSSValue(CSSPropertyOffsetPosition);

etc.

[Eric Willigers, 2016/09/29 03:53:18]

Done.

+    const CSSValue* offsetPathValue = offsetPathProperty.value();
+    const CSSValue* offsetDistanceValue = offsetDistanceProperty.value();
+    const CSSValue* offsetRotationValue = offsetRotationProperty.value();
+    const CSSValue* offsetAnchorValue = offsetAnchorProperty.value();
+
+    StringBuilder result;
+    if (offsetPositionValue->isValuePair()) {
+        result.append(offsetPositionValue->cssText());
+        result.append(' ');
+    }
+    result.append(offsetPathValue->cssText());
+    result.append(' ');
+    result.append(offsetDistanceValue->cssText());
+    result.append(' ');
+    result.append(offsetRotationValue->cssText());
+
+    bool anchorIsCentre = false;
+    if (offsetAnchorValue->isValuePair()) {
+        const CSSValuePair* pair = toCSSValuePair(offsetAnchorValue);
+        const CSSPrimitiveValue& first = toCSSPrimitiveValue(pair->first());
+        const CSSPrimitiveValue& second = toCSSPrimitiveValue(pair->second());
+        anchorIsCentre = first.isPercentage() && first.getDoubleValue() == 50 && second.isPercentage() && second.getDoubleValue() == 50;
+    }
+    if (!anchorIsCentre) {
+        result.append('/');
+        result.append(offsetAnchorValue->cssText());
+    }
+    return result.toString();
+}
+
 String StylePropertySerializer::fontValue() const
 {
     int fontSizePropertyIndex = m_propertySet.findPropertyIndex(CSSPropertyFontSize);
     int fontFamilyPropertyIndex = m_propertySet.findPropertyIndex(CSSPropertyFontFamily);
     int fontVariantCapsPropertyIndex = m_propertySet.findPropertyIndex(CSSPropertyFontVariantCaps);
     int fontVariantLigaturesPropertyIndex = m_propertySet.findPropertyIndex(CSSPropertyFontVariantLigatures);
     int fontVariantNumericPropertyIndex = m_propertySet.findPropertyIndex(CSSPropertyFontVariantNumeric);
     DCHECK_NE(fontSizePropertyIndex, -1);
     DCHECK_NE(fontFamilyPropertyIndex, -1);
     DCHECK_NE(fontVariantCapsPropertyIndex, -1);
@@ skipping 311 matching lines @@
             builder.append(", ");
 
         const CSSValue& xValue = repeatXList ? repeatXList->item(i % repeatXList->length()) : repeatX;
         const CSSValue& yValue = repeatYList ? repeatYList->item(i % repeatYList->length()) : repeatY;
         appendBackgroundRepeatValue(builder, xValue, yValue);
     }
     return builder.toString();
 }
 
 } // namespace blink