Android: Extend ViewAndroid

content/browser/renderer_host/render_widget_host_view_android.h

Index: content/browser/renderer_host/render_widget_host_view_android.h
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
index eab7d120fe5d567f6b029a164d294537364cd2c6..ae0f8d52675032ff1a3daf344e87140f3a0da39a 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -33,6 +33,7 @@
 #include "content/public/browser/readback_types.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/android/view_android.h"
 #include "ui/android/window_android_observer.h"
 #include "ui/events/gesture_detection/filtered_gesture_provider.h"
 #include "ui/gfx/geometry/size.h"
@@ -341,7 +342,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
   // Body background color of the underlying document.
   SkColor cached_background_color_;
 
-  scoped_refptr<cc::Layer> layer_;
+  mutable ui::ViewAndroid view_;

[Yusuf, 2016/07/08 16:35:05]

Where do we initialize this? and also in destroy should there be any cleanup
related with this.

[no sievers, 2016/07/08 18:29:04]

We set the |view_|'s layer still at the same time that we used to create or
destroy the former |layer_|. I *tried* to not make any major changes at least as
far as functional flow or lifetime is concerned.

See SetLayer() and also AddChild()/RemoveChild() (for making sure the layer here
still reaches the same WindowAndroid and Delegate at all times as before the
patch) in the .cc file.

 
   std::unique_ptr<cc::SurfaceIdAllocator> id_allocator_;
   std::unique_ptr<cc::SurfaceFactory> surface_factory_;