Index: third_party/WebKit/Source/platform/animation/CompositorTransformKeyframe.h |
diff --git a/third_party/WebKit/public/platform/WebTransformKeyframe.h b/third_party/WebKit/Source/platform/animation/CompositorTransformKeyframe.h |
similarity index 67% |
rename from third_party/WebKit/public/platform/WebTransformKeyframe.h |
rename to third_party/WebKit/Source/platform/animation/CompositorTransformKeyframe.h |
index 4adc83af5845124fd0c12a3e520f8e77f7dd26a8..8ee9325eb8cff59918011bc625475a3563214fe2 100644 |
--- a/third_party/WebKit/public/platform/WebTransformKeyframe.h |
+++ b/third_party/WebKit/Source/platform/animation/CompositorTransformKeyframe.h |
@@ -22,35 +22,31 @@ |
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
-#ifndef WebTransformKeyframe_h |
-#define WebTransformKeyframe_h |
+#ifndef CompositorTransformKeyframe_h |
+#define CompositorTransformKeyframe_h |
-#include "WebNonCopyable.h" |
-#include "WebPrivateOwnPtr.h" |
-#include "WebTransformOperations.h" |
-#if INSIDE_BLINK |
-namespace WTF { template <typename T> class PassOwnPtr; } |
-#endif |
+#include "platform/PlatformExport.h" |
+#include "platform/animation/CompositorTransformOperations.h" |
+#include "wtf/Noncopyable.h" |
+#include "wtf/OwnPtr.h" |
+#include "wtf/PassOwnPtr.h" |
namespace blink { |
-class WebTransformKeyframe : public WebNonCopyable { |
+class PLATFORM_EXPORT CompositorTransformKeyframe { |
+ WTF_MAKE_NONCOPYABLE(CompositorTransformKeyframe); |
public: |
-#if INSIDE_BLINK |
- BLINK_PLATFORM_EXPORT WebTransformKeyframe(double time, WTF::PassOwnPtr<WebTransformOperations> value); |
-#endif |
+ CompositorTransformKeyframe(double time, PassOwnPtr<CompositorTransformOperations> value); |
+ ~CompositorTransformKeyframe(); |
- BLINK_PLATFORM_EXPORT ~WebTransformKeyframe(); |
- |
- BLINK_PLATFORM_EXPORT double time() const; |
- |
- BLINK_PLATFORM_EXPORT const WebTransformOperations& value() const; |
+ double time() const; |
+ const CompositorTransformOperations& value() const; |
private: |
double m_time; |
- WebPrivateOwnPtr<WebTransformOperations> m_value; |
+ OwnPtr<CompositorTransformOperations> m_value; |
}; |
} // namespace blink |
-#endif // WebTransformKeyframe_h |
+#endif // CompositorTransformKeyframe_h |