Commit 57d2a7e1 authored by tfarina's avatar tfarina Committed by Commit bot

ui: Replace MessageLoopProxy usage with ThreadTaskRunnerHandle.

MessageLoopProxy is deprecated.

This basically does a search and replace:

MessageLoopProxy::current() -> ThreadTaskRunnerHandle::Get().

BUG=391045
TEST=unittests
R=sky@chromium.org

Review URL: https://codereview.chromium.org/516173002

Cr-Commit-Position: refs/heads/master@{#293157}
parent 6e5a8c50
......@@ -4,7 +4,7 @@
#include "ui/app_list/views/top_icon_animation_view.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/thread_task_runner_handle.h"
#include "ui/app_list/app_list_constants.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
#include "ui/gfx/image/image_skia_operations.h"
......@@ -84,7 +84,7 @@ void TopIconAnimationView::OnImplicitAnimationsCompleted() {
FOR_EACH_OBSERVER(TopIconAnimationObserver,
observers_,
OnTopIconAnimationsComplete());
base::MessageLoopProxy::current()->DeleteSoon(FROM_HERE, this);
base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
}
bool TopIconAnimationView::RequiresNotificationWhenAnimatorDestroyed() const {
......
......@@ -5,7 +5,7 @@
#include "ui/aura/window_tree_host.h"
#include "base/debug/trace_event.h"
#include "base/message_loop/message_loop.h"
#include "base/thread_task_runner_handle.h"
#include "ui/aura/client/capture_client.h"
#include "ui/aura/client/cursor_client.h"
#include "ui/aura/env.h"
......@@ -207,7 +207,7 @@ void WindowTreeHost::CreateCompositor(
compositor_.reset(
new ui::Compositor(GetAcceleratedWidget(),
context_factory,
base::MessageLoopProxy::current()));
base::ThreadTaskRunnerHandle::Get()));
// TODO(beng): I think this setup should probably all move to a "accelerated
// widget available" function.
if (!dispatcher()) {
......
......@@ -13,7 +13,7 @@
#include "base/compiler_specific.h"
#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/thread_task_runner_handle.h"
#include "ui/compositor/compositor.h"
#include "ui/gfx/rect.h"
......@@ -133,7 +133,7 @@ void TestCompositorHostMac::Show() {
[[AcceleratedTestView alloc] init]);
compositor_.reset(new ui::Compositor(view,
context_factory_,
base::MessageLoopProxy::current()));
base::ThreadTaskRunnerHandle::Get()));
compositor_->SetScaleAndSize(1.0f, bounds_.size());
[view setCompositor:compositor_.get()];
[window_ setContentView:view];
......
......@@ -10,7 +10,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/thread_task_runner_handle.h"
#include "ui/compositor/compositor.h"
#include "ui/gfx/rect.h"
......@@ -56,7 +56,7 @@ void TestCompositorHostOzone::Show() {
// available: http://crbug.com/255128
compositor_.reset(new ui::Compositor(1,
context_factory_,
base::MessageLoopProxy::current()));
base::ThreadTaskRunnerHandle::Get()));
compositor_->SetScaleAndSize(1.0f, bounds_.size());
}
......
......@@ -6,7 +6,7 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/thread_task_runner_handle.h"
#include "ui/compositor/compositor.h"
#include "ui/gfx/win/window_impl.h"
......@@ -20,7 +20,7 @@ class TestCompositorHostWin : public TestCompositorHost,
Init(NULL, bounds);
compositor_.reset(new ui::Compositor(hwnd(),
context_factory,
base::MessageLoopProxy::current()));
base::ThreadTaskRunnerHandle::Get()));
compositor_->SetScaleAndSize(1.0f, GetSize());
}
......
......@@ -12,7 +12,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/thread_task_runner_handle.h"
#include "ui/compositor/compositor.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/x/x11_types.h"
......@@ -77,7 +77,7 @@ void TestCompositorHostX11::Show() {
}
compositor_.reset(new ui::Compositor(window_,
context_factory_,
base::MessageLoopProxy::current()));
base::ThreadTaskRunnerHandle::Get()));
compositor_->SetScaleAndSize(1.0f, bounds_.size());
}
......
......@@ -10,6 +10,7 @@
#include "base/debug/trace_event.h"
#include "base/stl_util.h"
#include "base/task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "base/threading/worker_pool.h"
#include "ui/events/ozone/device/device_event.h"
#include "ui/events/ozone/device/device_manager.h"
......@@ -198,7 +199,7 @@ void EventFactoryEvdev::OnDeviceEvent(const DeviceEvent& event) {
void EventFactoryEvdev::OnDispatcherListChanged() {
if (!ui_task_runner_) {
ui_task_runner_ = base::MessageLoopProxy::current();
ui_task_runner_ = base::ThreadTaskRunnerHandle::Get();
// Scan & monitor devices.
device_manager_->AddObserver(this);
device_manager_->ScanDevices(this);
......
......@@ -7,7 +7,8 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "base/time/default_tick_clock.h"
#include "ui/events/event.h"
#include "ui/events/event_source.h"
......@@ -589,7 +590,7 @@ void EventGenerator::DoDispatchEvent(ui::Event* event, bool async) {
return;
}
if (pending_events_.empty()) {
base::MessageLoopProxy::current()->PostTask(
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(&EventGenerator::DispatchNextPendingEvent,
base::Unretained(this)));
......@@ -611,7 +612,7 @@ void EventGenerator::DispatchNextPendingEvent() {
pending_events_.pop_front();
delete event;
if (!pending_events_.empty()) {
base::MessageLoopProxy::current()->PostTask(
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(&EventGenerator::DispatchNextPendingEvent,
base::Unretained(this)));
......
......@@ -5,14 +5,15 @@
#include "ui/gl/android/surface_texture_listener.h"
#include "base/location.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "jni/SurfaceTextureListener_jni.h"
namespace gfx {
SurfaceTextureListener::SurfaceTextureListener(const base::Closure& callback)
: callback_(callback),
browser_loop_(base::MessageLoopProxy::current()) {
browser_loop_(base::ThreadTaskRunnerHandle::Get()) {
}
SurfaceTextureListener::~SurfaceTextureListener() {
......
......@@ -11,7 +11,7 @@
#include "ui/gl/gl_export.h"
namespace base {
class MessageLoopProxy;
class SingleThreadTaskRunner;
}
namespace gfx {
......@@ -37,7 +37,7 @@ class GL_EXPORT SurfaceTextureListener {
base::Closure callback_;
scoped_refptr<base::MessageLoopProxy> browser_loop_;
scoped_refptr<base::SingleThreadTaskRunner> browser_loop_;
DISALLOW_IMPLICIT_CONSTRUCTORS(SurfaceTextureListener);
};
......
......@@ -15,8 +15,10 @@ extern "C" {
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/synchronization/cancellation_flag.h"
#include "base/synchronization/lock.h"
#include "base/thread_task_runner_handle.h"
#include "base/threading/non_thread_safe.h"
#include "base/threading/thread.h"
#include "base/time/time.h"
......@@ -128,7 +130,7 @@ class SGIVideoSyncProviderThreadShim {
explicit SGIVideoSyncProviderThreadShim(XID window)
: window_(window),
context_(NULL),
message_loop_(base::MessageLoopProxy::current()),
task_runner_(base::ThreadTaskRunnerHandle::Get()),
cancel_vsync_flag_(),
vsync_lock_() {
// This ensures that creation of |window_| has occured when this shim
......@@ -204,7 +206,7 @@ class SGIVideoSyncProviderThreadShim {
const base::TimeDelta kDefaultInterval =
base::TimeDelta::FromSeconds(1) / 60;
message_loop_->PostTask(
task_runner_->PostTask(
FROM_HERE, base::Bind(callback, now, kDefaultInterval));
}
......@@ -218,7 +220,7 @@ class SGIVideoSyncProviderThreadShim {
XID window_;
GLXContext context_;
scoped_refptr<base::MessageLoopProxy> message_loop_;
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
base::CancellationFlag cancel_vsync_flag_;
base::Lock vsync_lock_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment