Explicitly specify the ui::Compositor to DelegatedFrameHost

content/browser/renderer_host/render_widget_host_view_mac.mm

 // 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/renderer_host/render_widget_host_view_mac.h"
 
 #import <objc/runtime.h>
 #include <OpenGL/gl.h>
 #include <QuartzCore/QuartzCore.h>
 
@@ skipping 376 matching lines @@
   return results;
 }
 
 }  // namespace
 
 namespace content {
 
 ////////////////////////////////////////////////////////////////////////////////
 // DelegatedFrameHost, public:
 
-ui::Compositor* RenderWidgetHostViewMac::GetCompositor() const {
-  // When |browser_compositor_| is suspended or destroyed, the connection
-  // between its ui::Compositor and |delegated_frame_host_| has been severed.
-  if (browser_compositor_state_ == BrowserCompositorActive)
-    return browser_compositor_->compositor();
-  return NULL;
-}
-
 ui::Layer* RenderWidgetHostViewMac::GetLayer() {
   return root_layer_.get();
 }
 
 RenderWidgetHostImpl* RenderWidgetHostViewMac::GetHost() {
   return render_widget_host_;
 }
 
 bool RenderWidgetHostViewMac::IsVisible() {
   return !render_widget_host_->is_hidden();
@@ skipping 181 matching lines @@
 
   // Create the view, to transition from Destroyed -> Suspended.
   if (browser_compositor_state_ == BrowserCompositorDestroyed) {
     browser_compositor_ = BrowserCompositorMac::Create();
     browser_compositor_->accelerated_widget_mac()->SetNSView(this);
     browser_compositor_state_ = BrowserCompositorSuspended;
   }
 
   // Show the DelegatedFrameHost to transition from Suspended -> Active.
   if (browser_compositor_state_ == BrowserCompositorSuspended) {
-    delegated_frame_host_->AddedToWindow();
+    delegated_frame_host_->SetCompositor(browser_compositor_->compositor());
     delegated_frame_host_->WasShown(ui::LatencyInfo());
     browser_compositor_->compositor()->SetRootLayer(
         root_layer_.get());
     browser_compositor_state_ = BrowserCompositorActive;
   }
 }
 
 void RenderWidgetHostViewMac::SuspendBrowserCompositorView() {
   TRACE_EVENT0("browser",
                "RenderWidgetHostViewMac::SuspendBrowserCompositorView");
 
   // Hide the DelegatedFrameHost to transition from Active -> Suspended.
   if (browser_compositor_state_ == BrowserCompositorActive) {
     // Disconnect the root layer, which will prevent the compositor from
     // producing more frames.
     browser_compositor_->compositor()->SetRootLayer(nullptr);
     // Marking the DelegatedFrameHost as removed from the window hierarchy is
     // necessary to remove all connections to its old ui::Compositor.
     delegated_frame_host_->WasHidden();
-    delegated_frame_host_->RemovingFromWindow();
+    delegated_frame_host_->ResetCompositor();
     browser_compositor_state_ = BrowserCompositorSuspended;
   }
 }
 
 void RenderWidgetHostViewMac::DestroyBrowserCompositorView() {
   TRACE_EVENT0("browser",
                "RenderWidgetHostViewMac::DestroyBrowserCompositorView");
 
   // Transition from Active -> Suspended if need be.
   SuspendBrowserCompositorView();
@@ skipping 2735 matching lines @@
 
 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding
 // regions that are not draggable. (See ControlRegionView in
 // native_app_window_cocoa.mm). This requires the render host view to be
 // draggable by default.
 - (BOOL)mouseDownCanMoveWindow {
   return YES;
 }
 
 @end