Use StylePath instead of (Path)StyleMotionPath

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

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. 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.
  *
@@ skipping 12 matching lines @@
 #include "core/style/ComputedStyle.h"
 
 #include "core/css/resolver/StyleResolver.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/layout/TextAutosizer.h"
 #include "core/style/AppliedTextDecoration.h"
 #include "core/style/BorderEdge.h"
 #include "core/style/ContentData.h"
 #include "core/style/DataEquivalency.h"
 #include "core/style/ComputedStyleConstants.h"
-#include "core/style/PathStyleMotionPath.h"
 #include "core/style/QuotesData.h"
 #include "core/style/ShadowList.h"
 #include "core/style/StyleImage.h"
 #include "core/style/StyleInheritedData.h"
 #include "core/style/StyleVariableData.h"
 #include "platform/LengthFunctions.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/fonts/Font.h"
 #include "platform/fonts/FontSelector.h"
 #include "platform/geometry/FloatRoundedRect.h"
@@ skipping 941 matching lines @@
         transformOperations[i]->apply(result, boundingBox.size());
 
     if (applyTransformOrigin) {
         result.translate3d(-originX, -originY, -originZ);
     }
 }
 
 void ComputedStyle::applyMotionPathTransform(float originX, float originY, TransformationMatrix& transform) const
 {
     const StyleMotionData& motionData = rareNonInheritedData->m_transform->m_motion;
-    ASSERT(motionData.m_path && motionData.m_path->isPathStyleMotionPath());
-    const PathStyleMotionPath& motionPath = toPathStyleMotionPath(*motionData.m_path);
+    ASSERT(motionData.m_path);
+    const StylePath& motionPath = *motionData.m_path;
     float pathLength = motionPath.length();
     float distance = floatValueForLength(motionData.m_offset, pathLength);
     float computedDistance;
     if (motionPath.isClosed() && pathLength > 0) {
         computedDistance = fmod(distance, pathLength);
         if (computedDistance < 0)
             computedDistance += pathLength;
     } else {
         computedDistance = clampTo<float>(distance, 0, pathLength);
     }
@@ skipping 667 matching lines @@
         else
             setMarginLeft(margin);
     } else {
         if (isLeftToRightDirection())
             setMarginBottom(margin);
         else
             setMarginTop(margin);
     }
 }
 
-void ComputedStyle::setMotionPath(PassRefPtr<StyleMotionPath> path)
+void ComputedStyle::setMotionPath(PassRefPtr<StylePath> path)
 {
-    ASSERT(path);
     rareNonInheritedData.access()->m_transform.access()->m_motion.m_path = path;
 }
 
-void ComputedStyle::resetMotionPath()
-{
-    rareNonInheritedData.access()->m_transform.access()->m_motion.m_path = nullptr;
-}
-
 int ComputedStyle::outlineOutsetExtent() const
 {
     if (!hasOutline())
         return 0;
     if (outlineStyleIsAuto())
         return GraphicsContext::focusRingOutsetExtent(outlineOffset(), outlineWidth());
     return std::max(0, outlineWidth() + outlineOffset());
 }
 
 bool ComputedStyle::columnRuleEquivalent(const ComputedStyle* otherStyle) const
@@ skipping 136 matching lines @@
     if (!shadowList)
         return false;
     for (size_t i = shadowList->shadows().size(); i--; ) {
         if (shadowList->shadows()[i].color().isCurrentColor())
             return true;
     }
     return false;
 }
 
 } // namespace blink