Migrate the Android compositor to cc::Layer classes.

content/browser/renderer_host/render_widget_host_view_android.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
 
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process.h"
 #include "content/browser/renderer_host/ime_adapter_android.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "ui/gfx/size.h"
 
 struct ViewHostMsg_TextInputState_Params;
 
 struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params;
 struct GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params;
 
+namespace cc {
+class Layer;
+class TextureLayer;
+}
+
 namespace WebKit {
 class WebExternalTextureLayer;
-class WebLayer;
 class WebTouchEvent;
 class WebMouseEvent;
 }
 
 namespace content {
 class ContentViewCoreImpl;
 class RenderWidgetHost;
 class RenderWidgetHostImpl;
 class SurfaceTextureTransportClient;
 struct NativeWebKeyboardEvent;
@@ skipping 124 matching lines @@
 
   // ContentViewCoreImpl is our interface to the view system.
   ContentViewCoreImpl* content_view_core_;
 
   ImeAdapterAndroid ime_adapter_android_;
 
   // Body background color of the underlying document.
   SkColor cached_background_color_;
 
   // The texture layer for this view when using browser-side compositing.
-  scoped_ptr<WebKit::WebExternalTextureLayer> texture_layer_;
+  scoped_refptr<cc::TextureLayer> texture_layer_;
 
   // The layer used for rendering the contents of this view.
   // It is either owned by texture_layer_ or surface_texture_transport_
   // depending on the mode.
-  WebKit::WebLayer* layer_;
+  scoped_refptr<cc::Layer> layer_;
 
   // The most recent texture id that was pushed to the texture layer.
   unsigned int texture_id_in_layer_;
 
   // The most recent texture size that was pushed to the texture layer.
   gfx::Size texture_size_in_layer_;
 
   // The handle for the transport surface (between renderer and browser-side
   // compositor) for this view.
   gfx::GLSurfaceHandle shared_surface_;
 
   // Used for image transport when needing to share resources across threads.
   scoped_ptr<SurfaceTextureTransportClient> surface_texture_transport_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
 };
 
 } // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_