summaryrefslogtreecommitdiffstats
path: root/webkit/compositor_bindings/web_layer_impl.cc
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 23:09:55 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 23:09:55 +0000
commit96baf3e81b1df4b0836d70c3cded9795e63fa789 (patch)
tree4332d128a05777ae34641ca2f185b7b548330b8d /webkit/compositor_bindings/web_layer_impl.cc
parent1597399122fa6d8343dc6d5cdb771f95908c09b1 (diff)
downloadchromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.zip
chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.tar.gz
chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.tar.bz2
cc: Rename cc classes and members to match filenames
Fixed reland of https://chromiumcodereview.appspot.com/11189043/ TBR=jam@chromium.org,jamesr@chromium.org BUG=155413 Review URL: https://codereview.chromium.org/11231054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/compositor_bindings/web_layer_impl.cc')
-rw-r--r--webkit/compositor_bindings/web_layer_impl.cc14
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 e476598..a54ae74 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::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();
}