Index: Source/core/rendering/animation/WebAnimationProvider.h |
diff --git a/Source/core/rendering/animation/WebAnimationProvider.h b/Source/core/rendering/animation/WebAnimationProvider.h |
index c13f38ae8a5e087ed525c8634b91714896b33618..724de2e1696f8bf5eb06bfe964cb41f1dec3e698 100644 |
--- a/Source/core/rendering/animation/WebAnimationProvider.h |
+++ b/Source/core/rendering/animation/WebAnimationProvider.h |
@@ -33,7 +33,7 @@ |
#include "wtf/PassOwnPtr.h" |
#include "wtf/text/WTFString.h" |
-namespace WebKit { |
+namespace blink { |
class WebAnimation; |
} |
@@ -48,9 +48,9 @@ struct WebAnimations { |
~WebAnimations(); |
WebAnimations(const WebAnimations&); |
bool isEmpty() const; |
- OwnPtr<WebKit::WebAnimation> m_transformAnimation; |
- OwnPtr<WebKit::WebAnimation> m_opacityAnimation; |
- OwnPtr<WebKit::WebAnimation> m_filterAnimation; |
+ OwnPtr<blink::WebAnimation> m_transformAnimation; |
+ OwnPtr<blink::WebAnimation> m_opacityAnimation; |
+ OwnPtr<blink::WebAnimation> m_filterAnimation; |
}; |
class WebAnimationProvider { |
@@ -65,7 +65,7 @@ public: |
WebAnimations startTransition(double timeOffset, CSSPropertyID, const RenderStyle* fromStyle, const RenderStyle* toStyle, bool hasTransform, bool hasFilter, const IntSize& boxSize, float fromOpacity, float toOpacity); |
private: |
- PassOwnPtr<WebKit::WebAnimation> createWebAnimationAndStoreId(const KeyframeValueList&, const IntSize& boxSize, const CSSAnimationData*, const String& animationName, double timeOffset); |
+ PassOwnPtr<blink::WebAnimation> createWebAnimationAndStoreId(const KeyframeValueList&, const IntSize& boxSize, const CSSAnimationData*, const String& animationName, double timeOffset); |
typedef HashMap<String, int> AnimationIdMap; |
AnimationIdMap m_animationIdMap; |