Chromium Code Reviews| 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 05f248272353e63711f8fc6f1dbef3e42dd5c9cf..d5b636bfbc3d7f8a4a3d8d32476706fa19e246c9 100644 |
| --- a/content/browser/android/content_view_render_view.cc |
| +++ b/content/browser/android/content_view_render_view.cc |
| @@ -31,8 +31,11 @@ bool ContentViewRenderView::RegisterContentViewRenderView(JNIEnv* env) { |
| return RegisterNativesImpl(env); |
| } |
| -ContentViewRenderView::ContentViewRenderView(JNIEnv* env, jobject obj) |
| - : buffers_swapped_during_composite_(false) { |
| +ContentViewRenderView::ContentViewRenderView(JNIEnv* env, |
| + jobject obj, |
| + gfx::NativeWindow root_window) |
| + : buffers_swapped_during_composite_(false), |
| + root_window_(root_window) { |
| java_obj_.Reset(env, obj); |
| } |
| @@ -40,9 +43,11 @@ ContentViewRenderView::~ContentViewRenderView() { |
| } |
| // static |
| -static jint Init(JNIEnv* env, jobject obj) { |
| +static jint Init(JNIEnv* env, jobject obj, jlong native_root_window) { |
|
no sievers
2013/11/15 22:56:19
nit: we already have |root_window|
powei
2013/11/18 19:29:59
can you elaborate? is this about the name |native
|
| + gfx::NativeWindow root_window = |
| + reinterpret_cast<gfx::NativeWindow>(native_root_window); |
| ContentViewRenderView* content_view_render_view = |
| - new ContentViewRenderView(env, obj); |
| + new ContentViewRenderView(env, obj, root_window); |
| return reinterpret_cast<jint>(content_view_render_view); |
| } |
| @@ -110,7 +115,7 @@ void ContentViewRenderView::OnSwapBuffersCompleted() { |
| void ContentViewRenderView::InitCompositor() { |
| if (!compositor_) |
| - compositor_.reset(Compositor::Create(this)); |
| + compositor_.reset(Compositor::Create(this, root_window_)); |
| } |
| } // namespace content |