| Index: cc/CCActiveAnimation.cpp
|
| diff --git a/cc/CCActiveAnimation.cpp b/cc/CCActiveAnimation.cpp
|
| index 1bf4033e8f27085a5f37caeffd68225dc790284b..f09209e1a7c71eb7ca89e4fa9524d2aeed21bc29 100644
|
| --- a/cc/CCActiveAnimation.cpp
|
| +++ b/cc/CCActiveAnimation.cpp
|
| @@ -30,7 +30,7 @@ static const char* const s_runStateNames[] = {
|
| "Aborted"
|
| };
|
|
|
| -COMPILE_ASSERT(static_cast<int>(WebCore::CCActiveAnimation::RunStateEnumSize) == WTF_ARRAY_LENGTH(s_runStateNames), RunState_names_match_enum);
|
| +COMPILE_ASSERT(static_cast<int>(cc::CCActiveAnimation::RunStateEnumSize) == WTF_ARRAY_LENGTH(s_runStateNames), RunState_names_match_enum);
|
|
|
| // This should match the TargetProperty enum.
|
| static const char* const s_targetPropertyNames[] = {
|
| @@ -38,11 +38,11 @@ static const char* const s_targetPropertyNames[] = {
|
| "Opacity"
|
| };
|
|
|
| -COMPILE_ASSERT(static_cast<int>(WebCore::CCActiveAnimation::TargetPropertyEnumSize) == WTF_ARRAY_LENGTH(s_targetPropertyNames), TargetProperty_names_match_enum);
|
| +COMPILE_ASSERT(static_cast<int>(cc::CCActiveAnimation::TargetPropertyEnumSize) == WTF_ARRAY_LENGTH(s_targetPropertyNames), TargetProperty_names_match_enum);
|
|
|
| } // namespace
|
|
|
| -namespace WebCore {
|
| +namespace cc {
|
|
|
| PassOwnPtr<CCActiveAnimation> CCActiveAnimation::create(PassOwnPtr<CCAnimationCurve> curve, int animationId, int groupId, TargetProperty targetProperty)
|
| {
|
| @@ -207,4 +207,4 @@ void CCActiveAnimation::pushPropertiesTo(CCActiveAnimation* other) const
|
| }
|
| }
|
|
|
| -} // namespace WebCore
|
| +} // namespace cc
|
|
|