Rolls cc and webkit_compositor up to 127340

webkit/compositor/WebContentLayerImpl.cpp

Index: webkit/compositor/WebContentLayerImpl.cpp
diff --git a/webkit/compositor/WebContentLayerImpl.cpp b/webkit/compositor/WebContentLayerImpl.cpp
index ae0722b19b9a3255ef620afd1f4cdab433d4b46c..05775a3f0c33fbd1e56628f7f837ba1f62520c5c 100644
--- a/webkit/compositor/WebContentLayerImpl.cpp
+++ b/webkit/compositor/WebContentLayerImpl.cpp
@@ -23,40 +23,40 @@ WebContentLayer* WebContentLayer::create(WebContentLayerClient* client)
 }
 
 WebContentLayerImpl::WebContentLayerImpl(WebContentLayerClient* client)
-    : m_webLayerImpl(adoptPtr(new WebLayerImpl(ContentLayerChromium::create(this))))
+    : m_layer(adoptPtr(new WebLayerImpl(ContentLayerChromium::create(this))))
     , m_client(client)
 {
-    m_webLayerImpl->layer()->setIsDrawable(true);
+    m_layer->layer()->setIsDrawable(true);
 }
 
 WebContentLayerImpl::~WebContentLayerImpl()
 {
-    static_cast<ContentLayerChromium*>(m_webLayerImpl->layer())->clearClient();
+    static_cast<ContentLayerChromium*>(m_layer->layer())->clearClient();
 }
 
 WebLayer* WebContentLayerImpl::layer()
 {
-    return m_webLayerImpl.get();
+    return m_layer.get();
 }
 
 void WebContentLayerImpl::setDoubleSided(bool doubleSided)
 {
-    m_webLayerImpl->layer()->setDoubleSided(doubleSided);
+    m_layer->layer()->setDoubleSided(doubleSided);
 }
 
 void WebContentLayerImpl::setContentsScale(float scale)
 {
-    m_webLayerImpl->layer()->setContentsScale(scale);
+    m_layer->layer()->setContentsScale(scale);
 }
 
 void WebContentLayerImpl::setUseLCDText(bool enable)
 {
-    m_webLayerImpl->layer()->setUseLCDText(enable);
+    m_layer->layer()->setUseLCDText(enable);
 }
 
 void WebContentLayerImpl::setDrawCheckerboardForMissingTiles(bool enable)
 {
-    m_webLayerImpl->layer()->setDrawCheckerboardForMissingTiles(enable);
+    m_layer->layer()->setDrawCheckerboardForMissingTiles(enable);
 }