Revert "cc: Rename cc classes and members to match filenames"

This reverts commit 184fac5add06d5f4670fa6be4a4d3b39232d51bb.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163059 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 7 deletions

diff --git a/webkit/compositor_bindings/web_layer_impl.cc b/webkit/compositor_bindings/web_layer_impl.cc
index a54ae74..e476598 100644
--- a/webkit/compositor_bindings/web_layer_impl.cc
+++ b/webkit/compositor_bindings/web_layer_impl.cc
@@ -19,8 +19,8 @@
 #include "web_animation_impl.h"
 #include "webcore_convert.h"
 
-using cc::ActiveAnimation;
-using cc::Layer;
+using cc::CCActiveAnimation;
+using cc::LayerChromium;
 
 namespace WebKit {
 
@@ -66,11 +66,11 @@ WebLayer* WebLayer::create()
 }
 
 WebLayerImpl::WebLayerImpl()
-    : m_layer(Layer::create())
+    : m_layer(LayerChromium::create())
 {
 }
 
-WebLayerImpl::WebLayerImpl(scoped_refptr<Layer> layer)
+WebLayerImpl::WebLayerImpl(scoped_refptr<LayerChromium> layer)
     : m_layer(layer)
 {
 }
@@ -294,7 +294,7 @@ void WebLayerImpl::setAnimationDelegate(WebAnimationDelegate* delegate)
 
 bool WebLayerImpl::addAnimation(WebAnimation* animation)
 {
-    return m_layer->addAnimation(static_cast<WebAnimationImpl*>(animation)->cloneToAnimation());
+    return m_layer->addAnimation(static_cast<WebAnimationImpl*>(animation)->cloneToCCAnimation());
 }
 
 void WebLayerImpl::removeAnimation(int animationId)
@@ -304,7 +304,7 @@ void WebLayerImpl::removeAnimation(int animationId)
 
 void WebLayerImpl::removeAnimation(int animationId, WebAnimation::TargetProperty targetProperty)
 {
-    m_layer->layerAnimationController()->removeAnimation(animationId, static_cast<ActiveAnimation::TargetProperty>(targetProperty));
+    m_layer->layerAnimationController()->removeAnimation(animationId, static_cast<CCActiveAnimation::TargetProperty>(targetProperty));
 }
 
 void WebLayerImpl::pauseAnimation(int animationId, double timeOffset)
@@ -433,7 +433,7 @@ void WebLayerImpl::setScrollClient(WebLayerScrollClient* scrollClient)
     m_layer->setLayerScrollClient(scrollClient);
 }
 
-Layer* WebLayerImpl::layer() const
+LayerChromium* WebLayerImpl::layer() const
 {
     return m_layer.get();
 }