Have WebContentsViewAndroid own ViewAndroid

content/browser/web_contents/web_contents_view_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/web_contents_view_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
+#include "cc/layers/layer.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/drop_data.h"
 #include "ui/display/screen.h"
@@ skipping 37 matching lines @@
 
 WebContentsViewAndroid::WebContentsViewAndroid(
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate)
     : web_contents_(web_contents),
       content_view_core_(NULL),
       delegate_(delegate) {
 }
 
 WebContentsViewAndroid::~WebContentsViewAndroid() {
+  if (view_ && view_->GetLayer())
+    view_->GetLayer()->RemoveFromParent();
 }
 
 void WebContentsViewAndroid::SetContentViewCore(
     ContentViewCoreImpl* content_view_core) {
   content_view_core_ = content_view_core;
   RenderWidgetHostViewAndroid* rwhv = static_cast<RenderWidgetHostViewAndroid*>(
       web_contents_->GetRenderWidgetHostView());
   if (rwhv)
     rwhv->SetContentViewCore(content_view_core_);
 
   if (web_contents_->ShowingInterstitialPage()) {
     rwhv = static_cast<RenderWidgetHostViewAndroid*>(
         web_contents_->GetInterstitialPage()
             ->GetMainFrame()
             ->GetRenderViewHost()
             ->GetWidget()
             ->GetView());
     if (rwhv)
       rwhv->SetContentViewCore(content_view_core_);
   }
 }
 
 gfx::NativeView WebContentsViewAndroid::GetNativeView() const {
-  return content_view_core_ ? content_view_core_->GetViewAndroid() : nullptr;
+  return view_.get();
 }
 
 gfx::NativeView WebContentsViewAndroid::GetContentNativeView() const {
   RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
   if (rwhv)
     return rwhv->GetNativeView();
 
   // TODO(sievers): This should return null.
   return GetNativeView();
 }
@@ skipping 53 matching lines @@
 
 gfx::Rect WebContentsViewAndroid::GetViewBounds() const {
   if (content_view_core_)
     return gfx::Rect(content_view_core_->GetViewSize());
 
   return gfx::Rect();
 }
 
 void WebContentsViewAndroid::CreateView(
     const gfx::Size& initial_size, gfx::NativeView context) {
+  // On Android, avoid using the native view copied over from the CreateParams
+  // of the existing web contents view where initial size and the view are
+  // already set. Embedder provides one associated with a Java layer
+  // content view and the delegate.
+  if (initial_size.IsEmpty() && context) view_.reset(context);
 }
 
 RenderWidgetHostViewBase* WebContentsViewAndroid::CreateViewForWidget(
     RenderWidgetHost* render_widget_host, bool is_guest_view_hack) {
   if (render_widget_host->GetView()) {
     // During testing, the view will already be set up in most cases to the
     // test view, so we don't want to clobber it with a real one. To verify that
     // this actually is happening (and somebody isn't accidentally creating the
     // view twice), we check for the RVH Factory, which will be set when we're
     // making special ones (which go along with the special views).
@@ skipping 146 matching lines @@
 // This is called when we the renderer asks us to take focus back (i.e., it has
 // iterated past the last focusable element on the page).
 void WebContentsViewAndroid::TakeFocus(bool reverse) {
   if (web_contents_->GetDelegate() &&
       web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse))
     return;
   web_contents_->GetRenderWidgetHostView()->Focus();
 }
 
 } // namespace content