| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/android/content_view_render_view.h" | 5 #include "content/browser/android/content_view_render_view.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
| 9 #include "base/android/scoped_java_ref.h" | 9 #include "base/android/scoped_java_ref.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/lazy_instance.h" | 11 #include "base/lazy_instance.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
| 14 #include "cc/layers/layer.h" | 14 #include "cc/layers/layer.h" |
| 15 #include "content/browser/android/content_view_core_impl.h" | 15 #include "content/browser/android/content_view_core_impl.h" |
| 16 #include "content/public/browser/android/compositor.h" | 16 #include "content/public/browser/android/compositor.h" |
| 17 #include "content/public/browser/android/content_view_layer_renderer.h" | 17 #include "content/public/browser/android/content_view_layer_renderer.h" |
| 18 #include "content/public/browser/android/layer_tree_build_helper.h" | 18 #include "content/public/browser/android/layer_tree_build_helper.h" |
| 19 #include "content/public/browser/android/ui_resource_provider.h" | |
| 20 #include "jni/ContentViewRenderView_jni.h" | 19 #include "jni/ContentViewRenderView_jni.h" |
| 21 #include "ui/gfx/android/java_bitmap.h" | 20 #include "ui/gfx/android/java_bitmap.h" |
| 22 #include "ui/gfx/size.h" | 21 #include "ui/gfx/size.h" |
| 23 | 22 |
| 24 #include <android/bitmap.h> | 23 #include <android/bitmap.h> |
| 25 #include <android/native_window_jni.h> | 24 #include <android/native_window_jni.h> |
| 26 | 25 |
| 27 using base::android::ScopedJavaLocalRef; | 26 using base::android::ScopedJavaLocalRef; |
| 28 | 27 |
| 29 namespace content { | 28 namespace content { |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 compositor_.reset(Compositor::Create(this, root_window_)); | 144 compositor_.reset(Compositor::Create(this, root_window_)); |
| 146 } | 145 } |
| 147 | 146 |
| 148 jlong ContentViewRenderView::GetUIResourceProvider(JNIEnv* env, | 147 jlong ContentViewRenderView::GetUIResourceProvider(JNIEnv* env, |
| 149 jobject obj) { | 148 jobject obj) { |
| 150 if (!compositor_) | 149 if (!compositor_) |
| 151 return 0; | 150 return 0; |
| 152 return reinterpret_cast<intptr_t>(&compositor_->GetUIResourceProvider()); | 151 return reinterpret_cast<intptr_t>(&compositor_->GetUIResourceProvider()); |
| 153 } | 152 } |
| 154 } // namespace content | 153 } // namespace content |
| OLD | NEW |