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

content/browser/renderer_host/render_widget_resize_helper_mac.cc

Index: content/browser/renderer_host/render_widget_resize_helper_mac.cc
diff --git a/content/browser/renderer_host/render_widget_resize_helper_mac.cc b/content/browser/renderer_host/render_widget_resize_helper_mac.cc
index 823c6848602586e12be00b7b75c18ccdbda1aa58..a864d1627d2592f98c993d906f96208d0ec79734 100644
--- a/content/browser/renderer_host/render_widget_resize_helper_mac.cc
+++ b/content/browser/renderer_host/render_widget_resize_helper_mac.cc
@@ -4,105 +4,13 @@
 
 #include "content/browser/renderer_host/render_widget_resize_helper_mac.h"
 
-#include <list>
-
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
-#include "content/public/browser/browser_thread.h"
+#include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
 
 namespace content {
 namespace {
 
-class WrappedTask;
-class PumpableTaskRunner;
-typedef std::list<WrappedTask*> WrappedTaskQueue;
-typedef base::Callback<void(base::WaitableEvent*, base::TimeDelta)>
-    EventTimedWaitCallback;
-
-// A wrapper for IPCs and tasks that we may potentially execute in
-// WaitForSingleTaskToRun. Because these tasks are sent to two places to run,
-// we to wrap them in this structure and track whether or not they have run
-// yet, to avoid running them twice.
-class WrappedTask {
- public:
-  WrappedTask(const base::Closure& closure, base::TimeDelta delay);
-  ~WrappedTask();
-  bool ShouldRunBefore(const WrappedTask& other);
-  void Run();
-  void AddToTaskRunnerQueue(PumpableTaskRunner* pumpable_task_runner);
-  void RemoveFromTaskRunnerQueue();
-  const base::TimeTicks& can_run_time() const { return can_run_time_; }
-
- private:
-  base::Closure closure_;
-  base::TimeTicks can_run_time_;
-  bool has_run_;
-  uint64 sequence_number_;
-  WrappedTaskQueue::iterator iterator_;
-
-  // Back pointer to the pumpable task runner that this task is enqueued in.
-  scoped_refptr<PumpableTaskRunner> pumpable_task_runner_;
-
-  DISALLOW_COPY_AND_ASSIGN(WrappedTask);
-};
-
-// The PumpableTaskRunner is a task runner that will wrap tasks in an
-// WrappedTask, enqueues that wrapped task in the queue to be pumped via
-// WaitForSingleWrappedTaskToRun during resizes, and posts the task to a
-// target task runner. The posted task will run only once, either through a
-// WaitForSingleWrappedTaskToRun call or through the target task runner.
-class PumpableTaskRunner : public base::SingleThreadTaskRunner {
- public:
-  explicit PumpableTaskRunner(
-      const EventTimedWaitCallback& event_timed_wait_callback);
-
-  // Enqueue WrappedTask and post it to |target_task_runner_|.
-  bool EnqueueAndPostWrappedTask(const tracked_objects::Location& from_here,
-                                 WrappedTask* task,
-                                 base::TimeDelta delay);
-
-  // Wait at most |max_delay| to run an enqueued task.
-  bool WaitForSingleWrappedTaskToRun(const base::TimeDelta& max_delay);
-
-  // Remove a wrapped task from the queue.
-  void RemoveWrappedTaskFromQueue(WrappedTask* task);
-
-  // base::SingleThreadTaskRunner implementation:
-  bool PostDelayedTask(const tracked_objects::Location& from_here,
-                       const base::Closure& task,
-                       base::TimeDelta delay) override;
-
-  bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
-                                  const base::Closure& task,
-                                  base::TimeDelta delay) override;
-
-  bool RunsTasksOnCurrentThread() const override;
-
- private:
-  friend class WrappedTask;
-
-  ~PumpableTaskRunner() override;
-
-  // A queue of live messages.  Must hold |task_queue_lock_| to access. Tasks
-  // are added only on the IO thread and removed only on the UI thread.  The
-  // WrappedTask objects are removed from the queue when they are run (by
-  // |target_task_runner_| or by a call to WaitForSingleWrappedTaskToRun
-  // removing them out of the queue, or by TaskRunner when it is destroyed).
-  WrappedTaskQueue task_queue_;
-  base::Lock task_queue_lock_;
-
-  // Event used to wake up the UI thread if it is sleeping in
-  // WaitForSingleTaskToRun.
-  base::WaitableEvent event_;
-
-  // Callback to call TimedWait on |event_| from an appropriate class.
-  EventTimedWaitCallback event_timed_wait_callback_;
-
-  scoped_refptr<base::SingleThreadTaskRunner> target_task_runner_;
-
-  DISALLOW_COPY_AND_ASSIGN(PumpableTaskRunner);
-};
-
 void HandleGpuIPC(int gpu_host_id, const IPC::Message& message) {
   GpuProcessHostUIShim* host = GpuProcessHostUIShim::FromID(gpu_host_id);
   if (host)
@@ -115,231 +23,24 @@ void HandleRendererIPC(int render_process_id, const IPC::Message& message) {
     host->OnMessageReceived(message);
 }
 
-base::LazyInstance<RenderWidgetResizeHelper> g_render_widget_task_runner =
-    LAZY_INSTANCE_INITIALIZER;
-
-////////////////////////////////////////////////////////////////////////////////
-// WrappedTask
-
-WrappedTask::WrappedTask(const base::Closure& closure, base::TimeDelta delay)
-    : closure_(closure),
-      can_run_time_(base::TimeTicks::Now() + delay),
-      has_run_(false),
-      sequence_number_(0) {}
-
-WrappedTask::~WrappedTask() {
-  RemoveFromTaskRunnerQueue();
-}
-
-bool WrappedTask::ShouldRunBefore(const WrappedTask& other) {
-  if (can_run_time_ < other.can_run_time_)
-    return true;
-  if (can_run_time_ > other.can_run_time_)
-    return false;
-  if (sequence_number_ < other.sequence_number_)
-    return true;
-  if (sequence_number_ > other.sequence_number_)
-    return false;
-  // Sequence numbers are unique, so this should never happen.
-  NOTREACHED();
-  return false;
-}
-
-void WrappedTask::Run() {
-  if (has_run_)
-    return;
-  RemoveFromTaskRunnerQueue();
-  has_run_ = true;
-  closure_.Run();
-}
-
-void WrappedTask::AddToTaskRunnerQueue(
-    PumpableTaskRunner* pumpable_task_runner) {
-  pumpable_task_runner_ = pumpable_task_runner;
-  base::AutoLock lock(pumpable_task_runner_->task_queue_lock_);
-  static uint64 last_sequence_number = 0;
-  last_sequence_number += 1;
-  sequence_number_ = last_sequence_number;
-  iterator_ = pumpable_task_runner_->task_queue_.insert(
-      pumpable_task_runner_->task_queue_.end(), this);
-}
-
-void WrappedTask::RemoveFromTaskRunnerQueue() {
-  if (!pumpable_task_runner_.get())
-    return;
-  // The scope of the task runner's lock must be limited because removing
-  // this reference to the task runner may destroy it.
-  {
-    base::AutoLock lock(pumpable_task_runner_->task_queue_lock_);
-    pumpable_task_runner_->task_queue_.erase(iterator_);
-    iterator_ = pumpable_task_runner_->task_queue_.end();
-  }
-  pumpable_task_runner_ = NULL;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// PumpableTaskRunner
-
-PumpableTaskRunner::PumpableTaskRunner(
-    const EventTimedWaitCallback& event_timed_wait_callback)
-    : event_(false /* auto-reset */, false /* initially signalled */),
-      event_timed_wait_callback_(event_timed_wait_callback),
-      target_task_runner_(
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)) {}
-
-PumpableTaskRunner::~PumpableTaskRunner() {
-  // Because tasks hold a reference to the task runner, the task queue must
-  // be empty when it is destroyed.
-  DCHECK(task_queue_.empty());
-}
-
-bool PumpableTaskRunner::WaitForSingleWrappedTaskToRun(
-    const base::TimeDelta& max_delay) {
-  base::TimeTicks stop_waiting_time = base::TimeTicks::Now() + max_delay;
-
-  for (;;) {
-    base::TimeTicks current_time = base::TimeTicks::Now();
-    base::TimeTicks next_task_time = stop_waiting_time;
-
-    // Find the first task to execute in the list. This lookup takes O(n) time,
-    // but n is rarely more than 2, and has never been observed to be more than
-    // 12.
-    WrappedTask* task_to_execute = NULL;
-    {
-      base::AutoLock lock(task_queue_lock_);
-
-      for (WrappedTaskQueue::iterator it = task_queue_.begin();
-           it != task_queue_.end(); ++it) {
-        WrappedTask* potential_task = *it;
-
-        // If this task is scheduled for the future, take it into account when
-        // deciding how long to sleep, and continue on to the next task.
-        if (potential_task->can_run_time() > current_time) {
-          if (potential_task->can_run_time() < next_task_time)
-            next_task_time = potential_task->can_run_time();
-          continue;
-        }
-        // If there is a better candidate than this task, continue to the next
-        // task.
-        if (task_to_execute &&
-            task_to_execute->ShouldRunBefore(*potential_task)) {
-          continue;
-        }
-        task_to_execute = potential_task;
-      }
-    }
-
-    if (task_to_execute) {
-      task_to_execute->Run();
-      return true;
-    }
-
-    // Calculate how much time we have left before we have to stop waiting or
-    // until a currently-enqueued task will be ready to run.
-    base::TimeDelta max_sleep_time = next_task_time - current_time;
-    if (max_sleep_time <= base::TimeDelta::FromMilliseconds(0))
-      break;
-
-    event_timed_wait_callback_.Run(&event_, max_sleep_time);
-  }
-
-  return false;
-}
-
-bool PumpableTaskRunner::EnqueueAndPostWrappedTask(
-    const tracked_objects::Location& from_here,
-    WrappedTask* task,
-    base::TimeDelta delay) {
-  task->AddToTaskRunnerQueue(this);
-
-  // Notify anyone waiting on the UI thread that there is a new entry in the
-  // task map.  If they don't find the entry they are looking for, then they
-  // will just continue waiting.
-  event_.Signal();
-
-  return target_task_runner_->PostDelayedTask(
-      from_here, base::Bind(&WrappedTask::Run, base::Owned(task)), delay);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// PumpableTaskRunner, base::SingleThreadTaskRunner implementation:
-
-bool PumpableTaskRunner::PostDelayedTask(
-    const tracked_objects::Location& from_here,
-    const base::Closure& task,
-    base::TimeDelta delay) {
-  return EnqueueAndPostWrappedTask(from_here, new WrappedTask(task, delay),
-                                   delay);
-}
-
-bool PumpableTaskRunner::PostNonNestableDelayedTask(
-    const tracked_objects::Location& from_here,
-    const base::Closure& task,
-    base::TimeDelta delay) {
-  // The correctness of non-nestable events hasn't been proven for this
-  // structure.
-  NOTREACHED();
-  return false;
-}
-
-bool PumpableTaskRunner::RunsTasksOnCurrentThread() const {
-  return target_task_runner_->RunsTasksOnCurrentThread();
-}
-
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetResizeHelper
 
-scoped_refptr<base::SingleThreadTaskRunner>
-RenderWidgetResizeHelper::task_runner() const {
-  return task_runner_;
-}
-
 // static
-RenderWidgetResizeHelper* RenderWidgetResizeHelper::Get() {
-  return g_render_widget_task_runner.Pointer();
-}
-
-bool RenderWidgetResizeHelper::WaitForSingleTaskToRun(
-    const base::TimeDelta& max_delay) {
-  PumpableTaskRunner* pumpable_task_runner =
-      reinterpret_cast<PumpableTaskRunner*>(task_runner_.get());
-  return pumpable_task_runner->WaitForSingleWrappedTaskToRun(max_delay);
-}
-
 void RenderWidgetResizeHelper::PostRendererProcessMsg(int render_process_id,
                                                       const IPC::Message& msg) {
-  PumpableTaskRunner* pumpable_task_runner =
-      reinterpret_cast<PumpableTaskRunner*>(task_runner_.get());
-  pumpable_task_runner->EnqueueAndPostWrappedTask(
-      FROM_HERE,
-      new WrappedTask(base::Bind(HandleRendererIPC, render_process_id, msg),
-                      base::TimeDelta()),
+  ui::WindowResizeHelperMac::Get()->task_runner()->PostDelayedTask(
+      FROM_HERE, base::Bind(HandleRendererIPC, render_process_id, msg),
       base::TimeDelta());
 }
 
+// static
 void RenderWidgetResizeHelper::PostGpuProcessMsg(int gpu_host_id,
                                                  const IPC::Message& msg) {
-  PumpableTaskRunner* pumpable_task_runner =
-      reinterpret_cast<PumpableTaskRunner*>(task_runner_.get());
-  pumpable_task_runner->EnqueueAndPostWrappedTask(
-      FROM_HERE, new WrappedTask(base::Bind(HandleGpuIPC, gpu_host_id, msg),
-                                 base::TimeDelta()),
-      base::TimeDelta());
-}
-
-RenderWidgetResizeHelper::RenderWidgetResizeHelper() {
-  task_runner_ = new PumpableTaskRunner(base::Bind(&EventTimedWait));
-}
-
-RenderWidgetResizeHelper::~RenderWidgetResizeHelper() {}
-
-// static
-void RenderWidgetResizeHelper::EventTimedWait(base::WaitableEvent* event,
-                                              base::TimeDelta delay) {
-  base::ThreadRestrictions::ScopedAllowWait allow_wait;
-  event->TimedWait(delay);
+  ui::WindowResizeHelperMac::Get()->task_runner()->PostDelayedTask(
+      FROM_HERE, base::Bind(HandleGpuIPC, gpu_host_id, msg), base::TimeDelta());
 }
 
 }  // namespace content