Migrate the Android compositor to cc::Layer classes.

android_webview/native/aw_contents.cc

 // 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.
 
 #include "android_webview/native/aw_contents.h"
 
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/net_disk_cache_remover.h"
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 #include "android_webview/common/aw_hit_test_data.h"
 #include "android_webview/native/aw_browser_dependency_factory.h"
 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
 #include "android_webview/native/aw_web_contents_delegate.h"
 #include "android_webview/native/state_serializer.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/pickle.h"
 #include "base/supports_user_data.h"
+#include "cc/layer.h"
 #include "content/components/navigation_interception/intercept_navigation_delegate.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/ssl_status.h"
 #include "jni/AwContents_jni.h"
 #include "net/base/x509_certificate.h"
+#include "ui/gfx/transform.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaRef;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
+using cc::Layer;
 using content::BrowserThread;
 using content::ContentViewCore;
 using content::InterceptNavigationDelegate;
 using content::WebContents;
 
 extern "C" {
 static AwDrawGLFunction DrawGLFunction;
 static void DrawGLFunction(int view_context,
                            AwDrawGLInfo* draw_info,
                            void* spare) {
@@ skipping 27 matching lines @@
 };
 
 // Work-around for http://crbug.com/161864. TODO(joth): Remove this class when
 // that bug is closed.
 class NullCompositor : public content::Compositor {
  public:
   NullCompositor() {}
   virtual ~NullCompositor() {}
 
   // Compositor
-  virtual void SetRootLayer(WebKit::WebLayer* root) OVERRIDE {}
+  virtual void SetRootLayer(scoped_refptr<cc::Layer> root) OVERRIDE {}
   virtual void SetWindowBounds(const gfx::Size& size) OVERRIDE {}
   virtual void SetVisible(bool visible) OVERRIDE {}
   virtual void SetWindowSurface(ANativeWindow* window) OVERRIDE {}
   virtual bool CompositeAndReadback(void *pixels, const gfx::Rect& rect)
       OVERRIDE {
     return false;
   }
   virtual void Composite() {}
   virtual WebKit::WebGLId GenerateTexture(gfx::JavaBitmap& bitmap) OVERRIDE {
     return 0;
@@ skipping 66 matching lines @@
 }
 
 jint AwContents::GetWebContents(JNIEnv* env, jobject obj) {
   return reinterpret_cast<jint>(web_contents_.get());
 }
 
 void AwContents::DidInitializeContentViewCore(JNIEnv* env, jobject obj,
                                               jint content_view_core) {
   ContentViewCore* core = reinterpret_cast<ContentViewCore*>(content_view_core);
   DCHECK(core == ContentViewCore::FromWebContents(web_contents_.get()));
-  compositor_->SetRootLayer(core->GetWebLayer());
+  compositor_->SetRootLayer(core->GetLayer());
 }
 
 void AwContents::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
 // static
 jint GetAwDrawGLFunction(JNIEnv* env, jclass) {
   return reinterpret_cast<jint>(&DrawGLFunction);
 }
@@ skipping 298 matching lines @@
   base::android::JavaByteArrayToByteVector(env, state, &state_vector);
 
   Pickle pickle(reinterpret_cast<const char*>(state_vector.begin()),
                 state_vector.size());
   PickleIterator iterator(pickle);
 
   return RestoreFromPickle(&iterator, web_contents_.get());
 }
 
 }  // namespace android_webview