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

Unified Diff: webkit/compositor_bindings/WebLayerImpl.cpp

Issue 11189043: cc: Rename cc classes and members to match filenames (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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
Index: webkit/compositor_bindings/WebLayerImpl.cpp
diff --git a/webkit/compositor_bindings/WebLayerImpl.cpp b/webkit/compositor_bindings/WebLayerImpl.cpp
index a1c6e3ec1f3e345f81bf9360b4ace03afe276173..6177d9985100f44f135737086c0ef43c743d4ffa 100644
--- a/webkit/compositor_bindings/WebLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebLayerImpl.cpp
@@ -19,8 +19,8 @@
#include "third_party/WebKit/Source/Platform/chromium/public/WebTransformationMatrix.h"
#include "webcore_convert.h"
-using cc::CCActiveAnimation;
-using cc::LayerChromium;
+using cc::ActiveAnimation;
+using cc::Layer;
namespace WebKit {
@@ -66,11 +66,11 @@ WebLayer* WebLayer::create()
}
WebLayerImpl::WebLayerImpl()
- : m_layer(LayerChromium::create())
+ : m_layer(Layer::create())
{
}
-WebLayerImpl::WebLayerImpl(scoped_refptr<LayerChromium> layer)
+WebLayerImpl::WebLayerImpl(scoped_refptr<Layer> 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)->cloneToCCAnimation());
+ return m_layer->addAnimation(static_cast<WebAnimationImpl*>(animation)->cloneToAnimation());
}
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<CCActiveAnimation::TargetProperty>(targetProperty));
+ m_layer->layerAnimationController()->removeAnimation(animationId, static_cast<ActiveAnimation::TargetProperty>(targetProperty));
}
void WebLayerImpl::pauseAnimation(int animationId, double timeOffset)
@@ -433,7 +433,7 @@ void WebLayerImpl::setScrollClient(WebLayerScrollClient* scrollClient)
m_layer->setLayerScrollClient(scrollClient);
}
-LayerChromium* WebLayerImpl::layer() const
+Layer* WebLayerImpl::layer() const
{
return m_layer.get();
}

Powered by Google App Engine
This is Rietveld 408576698