Migrate the Android compositor to cc::Layer classes.

content/browser/android/content_view_core_impl.cc

Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index 3dee35f6509312c71324d4dbffacb8c86b40c241..ad422dda8d945427d624b40343dbca77458dbe0e 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -11,6 +11,7 @@
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
+#include "cc/layer.h"
 #include "content/browser/android/interstitial_page_delegate_android.h"
 #include "content/browser/android/load_url_params.h"
 #include "content/browser/android/touch_point.h"
@@ -57,10 +58,10 @@ using base::android::MethodID;
 using base::android::JavaByteArrayToByteVector;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
+using cc::Layer;

[joth, 2012/11/29 21:19:38]

nit: rather than using, I think saying cc::Layer at usage site is actually
easier to understand. 

[Leandro Graciá Gil, 2012/11/30 12:11:11]

Done.

 using WebKit::WebGestureEvent;
 using WebKit::WebInputEvent;
 using WebKit::WebInputEventFactory;
-using WebKit::WebLayer;
 
 // Describes the type and enabled state of a select popup item.
 // Keep in sync with the value defined in SelectPopupDialog.java
@@ -147,7 +148,7 @@ ContentViewCoreImpl::ContentViewCoreImpl(JNIEnv* env, jobject obj,
                                          ui::WindowAndroid* window_android)
     : java_ref_(env, obj),
       web_contents_(static_cast<WebContentsImpl*>(web_contents)),
-      root_layer_(WebLayer::create()),
+      root_layer_(Layer::create()),
       tab_crashed_(false),
       window_android_(window_android) {
   DCHECK(web_contents) <<
@@ -600,11 +601,11 @@ gfx::Rect ContentViewCoreImpl::GetBounds() const {
                    Java_ContentViewCore_getHeight(env, j_obj.obj()));
 }
 
-void ContentViewCoreImpl::AttachWebLayer(WebLayer* layer) {
+void ContentViewCoreImpl::AttachLayer(scoped_refptr<Layer> layer) {
   root_layer_->addChild(layer);
 }
 
-void ContentViewCoreImpl::RemoveWebLayer(WebLayer* layer) {
+void ContentViewCoreImpl::RemoveLayer(scoped_refptr<Layer> layer) {
   layer->removeFromParent();
 }
 
@@ -618,7 +619,7 @@ ui::WindowAndroid* ContentViewCoreImpl::GetWindowAndroid() const {
   return window_android_;
 }
 
-WebLayer* ContentViewCoreImpl::GetWebLayer() const {
+scoped_refptr<Layer> ContentViewCoreImpl::GetLayer() const {
   return root_layer_.get();
 }