Resolves layering violation in SynchronousCompositorHost creation

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 10f335fe030b39206231da383cf90b5ffeed12ea..be62ea71c4f0a66c28fa4b2b1fad9467d7032e66 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -62,6 +62,7 @@ class OverscrollControllerAndroid;
 class RenderWidgetHost;
 class RenderWidgetHostImpl;
 class SynchronousCompositorHost;
+class SynchronousCompositorClient;
 struct NativeWebKeyboardEvent;
 struct TextInputState;
 
@@ -78,7 +79,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
       public content::ContentViewCoreImplObserver {
  public:
   RenderWidgetHostViewAndroid(RenderWidgetHostImpl* widget,
-                              ContentViewCoreImpl* content_view_core);
+      ContentViewCoreImpl* content_view_core,
+      SynchronousCompositorClient* compositor_client);

[boliu, 2016/11/10 17:52:34]

is the constructor arg required? can't we just construct and set immediately
after?

[Jinsuk Kim, 2016/11/10 17:55:15]

That's how it was done but it caused a problem. The constructor calls
setContentViewCore() where it expects compositor client to be already set.

Or I could pull setContentViewCore out of ctr but there may be other consequence
I have to check.

[boliu, 2016/11/10 17:59:21]

I don't think there is any more need to tie the lifetime of sync_compositor_ to
whether there's a CVC. they are unrelated. it was just convenient to have a
place to poll for the scclient

I think with this change, you can just create compositor in the set call, if the
client is not null, and then never destroy it

[Jinsuk Kim, 2016/11/10 21:22:19]

SG. Reverted.

   ~RenderWidgetHostViewAndroid() override;
 
   void Blur();
@@ -237,6 +239,14 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
 
   void SynchronousFrameMetadata(cc::CompositorFrameMetadata frame_metadata);
 
+  void set_synchronous_compositor_client(SynchronousCompositorClient* client) {
+    synchronous_compositor_client_ = client;
+  }
+
+  SynchronousCompositorClient* synchronous_compositor_client() const {
+    return synchronous_compositor_client_;
+  }
+
   static void OnContextLost();
 
  private:
@@ -351,6 +361,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
   const bool using_browser_compositor_;
   std::unique_ptr<SynchronousCompositorHost> sync_compositor_;
 
+  SynchronousCompositorClient* synchronous_compositor_client_;
+
   std::unique_ptr<DelegatedFrameEvictor> frame_evictor_;
 
   size_t locks_on_frame_count_;