diff options
| author | leandrogracia@chromium.org <leandrogracia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-03 14:54:35 +0000 |
|---|---|---|
| committer | leandrogracia@chromium.org <leandrogracia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-03 14:54:35 +0000 |
| commit | d9c747afb8d40d0d5b8c2f183e43dc48028a0401 (patch) | |
| tree | f9c863e989ea7fc872e2ad1cd62c0cbd8a1963a2 /android_webview/native/aw_contents.cc | |
| parent | efc8d157a0da4cf561399761d7d1d76435bc832c (diff) | |
| download | chromium_src-d9c747afb8d40d0d5b8c2f183e43dc48028a0401.zip chromium_src-d9c747afb8d40d0d5b8c2f183e43dc48028a0401.tar.gz chromium_src-d9c747afb8d40d0d5b8c2f183e43dc48028a0401.tar.bz2 | |
Migrate the Android compositor to cc::Layer classes.
BUG=163210
Review URL: https://codereview.chromium.org/11428091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170737 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/native/aw_contents.cc')
| -rw-r--r-- | android_webview/native/aw_contents.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc index 9a8cede..adefe82 100644 --- a/android_webview/native/aw_contents.cc +++ b/android_webview/native/aw_contents.cc @@ -21,6 +21,7 @@ #include "base/message_loop.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" @@ -31,6 +32,7 @@ #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; @@ -87,7 +89,7 @@ class NullCompositor : public content::Compositor { 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 {} @@ -190,7 +192,7 @@ 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()); Invalidate(); } |