Explicitly specify the ui::Compositor to DelegatedFrameHost

content/browser/compositor/delegated_frame_host.h

Index: content/browser/compositor/delegated_frame_host.h
diff --git a/content/browser/compositor/delegated_frame_host.h b/content/browser/compositor/delegated_frame_host.h
index 59431018ceefefb84686de529029df9eed271642..593455b97fb183f9f6372ece5dc6e6d1a239d07e 100644
--- a/content/browser/compositor/delegated_frame_host.h
+++ b/content/browser/compositor/delegated_frame_host.h
@@ -44,7 +44,6 @@ class ResizeLock;
 // display them.
 class CONTENT_EXPORT DelegatedFrameHostClient {
  public:
-  virtual ui::Compositor* GetCompositor() const = 0;
   virtual ui::Layer* GetLayer() = 0;
   virtual RenderWidgetHostImpl* GetHost() = 0;
   virtual bool IsVisible() = 0;
@@ -96,8 +95,8 @@ class CONTENT_EXPORT DelegatedFrameHost
   void WasResized();
   bool HasSavedFrame();
   gfx::Size GetRequestedRendererSize() const;
-  void AddedToWindow();
-  void RemovingFromWindow();
+  void SetCompositor(ui::Compositor* compositor);
+  void ResetCompositor();
   void CopyFromCompositingSurface(const gfx::Rect& src_subrect,
                                   const gfx::Size& output_size,
                                   ReadbackRequestCallback& callback,
@@ -151,6 +150,7 @@ class CONTENT_EXPORT DelegatedFrameHost
   void OnCompositingEnded(ui::Compositor* compositor) override;
   void OnCompositingAborted(ui::Compositor* compositor) override;
   void OnCompositingLockStateChanged(ui::Compositor* compositor) override;
+  void OnCompositingShuttingDown(ui::Compositor* compositor) override;
 
   // Overridden from ui::CompositorVSyncManager::Observer:
   void OnUpdateVSyncParameters(base::TimeTicks timebase,
@@ -228,6 +228,8 @@ class CONTENT_EXPORT DelegatedFrameHost
 
   DelegatedFrameHostClient* client_;
 
+  ui::Compositor* compositor_;
+
   // True if this renders into a Surface, false if it renders into a delegated
   // layer.
   bool use_surfaces_;