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

Unified Diff: Source/core/animation/AnimatableLengthPoint3D.cpp

Issue 212483003: CSS Transforms: Implement transform-origin (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. Created 6 years, 9 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
« no previous file with comments | « Source/core/animation/AnimatableLengthPoint3D.h ('k') | Source/core/animation/AnimatableValue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/AnimatableLengthPoint3D.cpp
diff --git a/Source/core/animation/AnimatableLengthPoint.cpp b/Source/core/animation/AnimatableLengthPoint3D.cpp
similarity index 64%
copy from Source/core/animation/AnimatableLengthPoint.cpp
copy to Source/core/animation/AnimatableLengthPoint3D.cpp
index e46f1a19c97fb54192c7009227ae2219bd225d6e..e46494c814332ee5b089b78e38af5ebd25ccd3de 100644
--- a/Source/core/animation/AnimatableLengthPoint.cpp
+++ b/Source/core/animation/AnimatableLengthPoint3D.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 Google Inc. All rights reserved.
+ * Copyright (C) 2014 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -29,36 +29,39 @@
*/
#include "config.h"
-#include "core/animation/AnimatableLengthPoint.h"
+#include "core/animation/AnimatableLengthPoint3D.h"
namespace WebCore {
-PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableLengthPoint::interpolateTo(const AnimatableValue* value, double fraction) const
+PassRefPtr<AnimatableValue> AnimatableLengthPoint3D::interpolateTo(const AnimatableValue* value, double fraction) const
{
- const AnimatableLengthPoint* lengthPoint = toAnimatableLengthPoint(value);
- return AnimatableLengthPoint::create(
+ const AnimatableLengthPoint3D* lengthPoint = toAnimatableLengthPoint3D(value);
+ return AnimatableLengthPoint3D::create(
AnimatableValue::interpolate(this->x(), lengthPoint->x(), fraction),
- AnimatableValue::interpolate(this->y(), lengthPoint->y(), fraction));
+ AnimatableValue::interpolate(this->y(), lengthPoint->y(), fraction),
+ AnimatableValue::interpolate(this->z(), lengthPoint->z(), fraction));
}
-PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableLengthPoint::addWith(const AnimatableValue* value) const
+PassRefPtr<AnimatableValue> AnimatableLengthPoint3D::addWith(const AnimatableValue* value) const
{
- const AnimatableLengthPoint* lengthPoint = toAnimatableLengthPoint(value);
- return AnimatableLengthPoint::create(
+ const AnimatableLengthPoint3D* lengthPoint = toAnimatableLengthPoint3D(value);
+ return AnimatableLengthPoint3D::create(
AnimatableValue::add(this->x(), lengthPoint->x()),
- AnimatableValue::add(this->y(), lengthPoint->y()));
+ AnimatableValue::add(this->y(), lengthPoint->y()),
+ AnimatableValue::add(this->z(), lengthPoint->z()));
}
-bool AnimatableLengthPoint::equalTo(const AnimatableValue* value) const
+bool AnimatableLengthPoint3D::equalTo(const AnimatableValue* value) const
{
- const AnimatableLengthPoint* lengthPoint = toAnimatableLengthPoint(value);
- return x()->equals(lengthPoint->x()) && y()->equals(lengthPoint->y());
+ const AnimatableLengthPoint3D* lengthPoint = toAnimatableLengthPoint3D(value);
+ return x()->equals(lengthPoint->x()) && y()->equals(lengthPoint->y()) && z()->equals(lengthPoint->z());
}
-void AnimatableLengthPoint::trace(Visitor* visitor)
+void AnimatableLengthPoint3D::trace(Visitor* visitor)
{
visitor->trace(m_x);
visitor->trace(m_y);
+ visitor->trace(m_z);
}
}
« no previous file with comments | « Source/core/animation/AnimatableLengthPoint3D.h ('k') | Source/core/animation/AnimatableValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698