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

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.cpp

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, 11 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
index 56b91c16d1a408cebf0043992b070855fe258212..3faff497fcecc07047d1205cab2a6c23e5e67c42 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -30,7 +30,6 @@
#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"
@@ -992,8 +991,8 @@ void ComputedStyle::applyTransform(TransformationMatrix& result, const FloatRect
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;
@@ -1681,17 +1680,11 @@ void ComputedStyle::setMarginEnd(const Length& 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())
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | third_party/WebKit/Source/core/style/PathStyleMotionPath.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698