Mac: move content::RenderWidgetResizeHelper to ui::WindowResizeHelperMac (acelerated_widget_mac)

content/browser/compositor/browser_compositor_view_mac.mm

 // Copyright 2014 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/compositor/browser_compositor_view_mac.h"
 
 #include "base/lazy_instance.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/compositor/image_transport_factory.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
-#include "content/browser/renderer_host/render_widget_resize_helper_mac.h"
 #include "content/public/browser/context_factory.h"
 #include "gpu/config/gpu_driver_bug_workaround_type.h"
 #include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
+#include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserCompositorMac
 
 namespace content {
 
 namespace {
 
 // Set when no browser compositors should remain alive.
 bool g_has_shut_down = false;
@@ skipping 10 matching lines @@
 bool WidgetNeedsGLFinishWorkaround() {
   return GpuDataManagerImpl::GetInstance()->IsDriverBugWorkaroundActive(
       gpu::FORCE_GL_FINISH_AFTER_COMPOSITING);
 }
 
 }  // namespace
 
 BrowserCompositorMac::BrowserCompositorMac()
     : accelerated_widget_mac_(
           new ui::AcceleratedWidgetMac(WidgetNeedsGLFinishWorkaround())),
-      compositor_(
-          content::GetContextFactory(),
-          RenderWidgetResizeHelper::Get()->task_runner()) {
+      compositor_(content::GetContextFactory(),
+                  ui::WindowResizeHelperMac::Get()->task_runner()) {
   compositor_.SetAcceleratedWidgetAndStartCompositor(
       accelerated_widget_mac_->accelerated_widget());
   compositor_.SetLocksWillTimeOut(false);
   Suspend();
   compositor_.AddObserver(this);
 }
 
 BrowserCompositorMac::~BrowserCompositorMac() {
   compositor_.RemoveObserver(this);
 }
 
 void BrowserCompositorMac::Suspend() {
   compositor_suspended_lock_ = compositor_.GetCompositorLock();
 }
 
 void BrowserCompositorMac::Unsuspend() {
   compositor_suspended_lock_ = nullptr;
 }
 
 void BrowserCompositorMac::OnCompositingDidCommit(
     ui::Compositor* compositor_that_did_commit) {
   DCHECK_EQ(compositor_that_did_commit, compositor());
   content::ImageTransportFactory::GetInstance()
       ->SetCompositorSuspendedForRecycle(compositor(), false);
 }
 
 // static
 scoped_ptr<BrowserCompositorMac> BrowserCompositorMac::Create() {
+  DCHECK(ui::WindowResizeHelperMac::Get()->task_runner());
   if (g_recyclable_browser_compositor.Get())
     return g_recyclable_browser_compositor.Get().Pass();
   return scoped_ptr<BrowserCompositorMac>(new BrowserCompositorMac).Pass();
 }
 
 // static
 void BrowserCompositorMac::Recycle(
     scoped_ptr<BrowserCompositorMac> compositor) {
   DCHECK(compositor);
   content::ImageTransportFactory::GetInstance()
@@ skipping 29 matching lines @@
   DCHECK_GT(g_placeholder_count, 0u);
   g_placeholder_count -= 1;
 
   // If there are no placeholders allocated, destroy the recyclable
   // BrowserCompositorMac.
   if (!g_placeholder_count)
     g_recyclable_browser_compositor.Get().reset();
 }
 
 }  // namespace content