| Index: ui/base/window_resize_helper.cc
|
| diff --git a/ui/accelerated_widget_mac/window_resize_helper_mac.cc b/ui/base/window_resize_helper.cc
|
| similarity index 93%
|
| rename from ui/accelerated_widget_mac/window_resize_helper_mac.cc
|
| rename to ui/base/window_resize_helper.cc
|
| index f36aa91dcc4680672acc5898746015f4ea19659b..ed2ee3901e53e3045167f409291b20abd660d309 100644
|
| --- a/ui/accelerated_widget_mac/window_resize_helper_mac.cc
|
| +++ b/ui/base/window_resize_helper.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
|
| +#include "ui/base/window_resize_helper.h"
|
|
|
| #include <list>
|
|
|
| @@ -104,7 +104,7 @@ class PumpableTaskRunner : public base::SingleThreadTaskRunner {
|
| DISALLOW_COPY_AND_ASSIGN(PumpableTaskRunner);
|
| };
|
|
|
| -base::LazyInstance<WindowResizeHelperMac>::Leaky g_window_resize_helper =
|
| +base::LazyInstance<WindowResizeHelper>::Leaky g_window_resize_helper =
|
| LAZY_INSTANCE_INITIALIZER;
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| @@ -278,26 +278,26 @@ bool PumpableTaskRunner::RunsTasksOnCurrentThread() const {
|
| } // namespace
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// WindowResizeHelperMac
|
| +// WindowResizeHelper
|
|
|
| -scoped_refptr<base::SingleThreadTaskRunner> WindowResizeHelperMac::task_runner()
|
| +scoped_refptr<base::SingleThreadTaskRunner> WindowResizeHelper::task_runner()
|
| const {
|
| return task_runner_;
|
| }
|
|
|
| // static
|
| -WindowResizeHelperMac* WindowResizeHelperMac::Get() {
|
| +WindowResizeHelper* WindowResizeHelper::Get() {
|
| return g_window_resize_helper.Pointer();
|
| }
|
|
|
| -void WindowResizeHelperMac::Init(
|
| +void WindowResizeHelper::Init(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& target_task_runner) {
|
| DCHECK(!task_runner_);
|
| task_runner_ = new PumpableTaskRunner(
|
| - base::Bind(&WindowResizeHelperMac::EventTimedWait), target_task_runner);
|
| + base::Bind(&WindowResizeHelper::EventTimedWait), target_task_runner);
|
| }
|
|
|
| -bool WindowResizeHelperMac::WaitForSingleTaskToRun(
|
| +bool WindowResizeHelper::WaitForSingleTaskToRun(
|
| const base::TimeDelta& max_delay) {
|
| PumpableTaskRunner* pumpable_task_runner =
|
| static_cast<PumpableTaskRunner*>(task_runner_.get());
|
| @@ -306,11 +306,11 @@ bool WindowResizeHelperMac::WaitForSingleTaskToRun(
|
| return pumpable_task_runner->WaitForSingleWrappedTaskToRun(max_delay);
|
| }
|
|
|
| -WindowResizeHelperMac::WindowResizeHelperMac() {}
|
| -WindowResizeHelperMac::~WindowResizeHelperMac() {}
|
| +WindowResizeHelper::WindowResizeHelper() {}
|
| +WindowResizeHelper::~WindowResizeHelper() {}
|
|
|
| -void WindowResizeHelperMac::EventTimedWait(base::WaitableEvent* event,
|
| - base::TimeDelta delay) {
|
| +void WindowResizeHelper::EventTimedWait(base::WaitableEvent* event,
|
| + base::TimeDelta delay) {
|
| base::ThreadRestrictions::ScopedAllowWait allow_wait;
|
| event->TimedWait(delay);
|
| }
|
|
|