android_webview: Let AwContents manage TouchHandleDrawable

content/browser/renderer_host/render_widget_host_view_android.cc

Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index 27a184c95d2321aa45e554f42d5d59d8a995e83d..27b0f1d0a85d22d4e4c8bc7c08f62f810cb49497 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -38,7 +38,6 @@
 #include "content/browser/android/composited_touch_handle_drawable.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/android/overscroll_controller_android.h"
-#include "content/browser/android/popup_touch_handle_drawable.h"
 #include "content/browser/android/synchronous_compositor_host.h"
 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
@@ -58,6 +57,7 @@
 #include "content/common/input_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/android/compositor.h"
+#include "content/public/browser/android/synchronous_compositor_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/render_view_host.h"
@@ -321,6 +321,9 @@ RenderWidgetHostViewAndroid::RenderWidgetHostViewAndroid(
 }
 
 RenderWidgetHostViewAndroid::~RenderWidgetHostViewAndroid() {
+  if (using_browser_compositor_ && sync_compositor_) {
+    sync_compositor_->client()->DestroyAllDrawables();

[boliu, 2016/08/26 20:28:02]

this is equivalent to awcontents.destroy (in most cases)

why can't you just call up from native Drawable destructor to tell java to
remove itself from the observer list?

[Jinsuk Kim, 2016/08/26 22:50:50]

Done. Passed the list to popup handle for it to remove itself on destroy().

+  }
   if (content_view_core_)
     content_view_core_->RemoveObserver(this);
   SetContentViewCore(NULL);
@@ -1091,10 +1094,12 @@ void RenderWidgetHostViewAndroid::OnSelectionEvent(
 std::unique_ptr<ui::TouchHandleDrawable>
 RenderWidgetHostViewAndroid::CreateDrawable() {
   DCHECK(content_view_core_);
-  if (!using_browser_compositor_)
-    return PopupTouchHandleDrawable::Create(
-        content_view_core_, ui::GetScaleFactorForNativeView(GetNativeView()));
-
+  if (!using_browser_compositor_) {
+    if (!sync_compositor_)
+      return nullptr;
+    return std::unique_ptr<ui::TouchHandleDrawable>(
+        sync_compositor_->client()->CreateDrawable());
+  }
   return std::unique_ptr<
       ui::TouchHandleDrawable>(new CompositedTouchHandleDrawable(
       content_view_core_->GetViewAndroid()->GetLayer(),