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 4faa4df97aaaabe29e9f145a98c4bb58a3538924..60fa853a343aa7bdb66c14191b2089826f2fd3f6 100644 |
| --- a/content/browser/android/content_view_render_view.cc |
| +++ b/content/browser/android/content_view_render_view.cc |
| @@ -53,12 +53,24 @@ void ContentViewRenderView::SetCurrentContentView( |
| InitCompositor(); |
| ContentViewCoreImpl* content_view = |
| reinterpret_cast<ContentViewCoreImpl*>(native_content_view); |
| - if (content_view) |
| + if (content_view) { |
| compositor_->SetRootLayer(content_view->GetLayer()); |
| - else |
| + content_view->SetCompositor(compositor_.get()); |
| + } else |
| compositor_->SetRootLayer(cc::Layer::Create()); |
| } |
| +void ContentViewRenderView::RemovePreviousContentView(JNIEnv* env, |
| + jobject obj, |
|
no sievers
2013/10/16 23:34:23
I don't think we need this here, see my comment in
powei
2013/10/19 00:05:18
Done. Removed.
|
| + int native_content_view) { |
| + DCHECK(compositor_); |
| + ContentViewCoreImpl* content_view = |
| + reinterpret_cast<ContentViewCoreImpl*>(native_content_view); |
| + if (content_view) { |
| + content_view->SetCompositor(NULL); |
| + } |
| +} |
| + |
| void ContentViewRenderView::SurfaceCreated( |
| JNIEnv* env, jobject obj, jobject jsurface) { |
| InitCompositor(); |