Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(896)

Unified Diff: content/browser/android/content_view_render_view.cc

Issue 2595263002: Introduce ViewRoot forwarding input/view events to native (Closed)
Patch Set: unittest Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/android/content_view_render_view.cc
diff --git a/content/browser/android/content_view_render_view.cc b/content/browser/android/content_view_render_view.cc
index 177d3f60aa40d34d44d814409febce10110d32e4..d49e1c028bc19b3314afc1eac3492e2a82070c16 100644
--- a/content/browser/android/content_view_render_view.cc
+++ b/content/browser/android/content_view_render_view.cc
@@ -36,8 +36,8 @@ bool ContentViewRenderView::RegisterContentViewRenderView(JNIEnv* env) {
ContentViewRenderView::ContentViewRenderView(JNIEnv* env,
jobject obj,
- gfx::NativeWindow root_window)
- : root_window_(root_window), current_surface_format_(0) {
+ ui::ViewRoot* view_root)
+ : view_root_(view_root), current_surface_format_(0) {
java_obj_.Reset(env, obj);
}
@@ -47,11 +47,11 @@ ContentViewRenderView::~ContentViewRenderView() {
// static
static jlong Init(JNIEnv* env,
const JavaParamRef<jobject>& obj,
- jlong native_root_window) {
- gfx::NativeWindow root_window =
- reinterpret_cast<gfx::NativeWindow>(native_root_window);
+ jlong native_view_root) {
+ ui::ViewRoot* view_root =
+ reinterpret_cast<ui::ViewRoot*>(native_view_root);
ContentViewRenderView* content_view_render_view =
- new ContentViewRenderView(env, obj, root_window);
+ new ContentViewRenderView(env, obj, view_root);
return reinterpret_cast<intptr_t>(content_view_render_view);
}
@@ -117,7 +117,7 @@ void ContentViewRenderView::OnSwapBuffersCompleted(int pending_swap_buffers) {
void ContentViewRenderView::InitCompositor() {
if (!compositor_)
- compositor_.reset(Compositor::Create(this, root_window_));
+ compositor_.reset(Compositor::Create(this, view_root_));
}
} // namespace content
« no previous file with comments | « content/browser/android/content_view_render_view.h ('k') | content/browser/renderer_host/compositor_impl_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698