summaryrefslogtreecommitdiffstats
path: root/content/gpu
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-04 14:17:11 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-04 14:17:11 +0000
commitdd32b127ce5deac52b24f493dac79195a30bf138 (patch)
treefe41d5b0b6fb1bcff0ccfc87a9f46cefee602723 /content/gpu
parent63b5c710324dc630a663eb76a6a4cc1372322830 (diff)
downloadchromium_src-dd32b127ce5deac52b24f493dac79195a30bf138.zip
chromium_src-dd32b127ce5deac52b24f493dac79195a30bf138.tar.gz
chromium_src-dd32b127ce5deac52b24f493dac79195a30bf138.tar.bz2
content: Use base::MessageLoop.
BUG=236029 R=avi@chromium.org Review URL: https://chromiumcodereview.appspot.com/14335017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198316 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu')
-rw-r--r--content/gpu/gpu_child_thread.cc6
-rw-r--r--content/gpu/gpu_info_collector_win.cc2
-rw-r--r--content/gpu/gpu_main.cc8
-rw-r--r--content/gpu/gpu_watchdog_thread.cc2
-rw-r--r--content/gpu/gpu_watchdog_thread.h4
5 files changed, 11 insertions, 11 deletions
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
index 24b0cd6..a4bc0ff7 100644
--- a/content/gpu/gpu_child_thread.cc
+++ b/content/gpu/gpu_child_thread.cc
@@ -38,7 +38,7 @@ bool GpuProcessLogMessageHandler(int severity,
// If we are not on main thread in child process, send through
// the sync_message_filter; otherwise send directly.
- if (MessageLoop::current() !=
+ if (base::MessageLoop::current() !=
ChildProcess::current()->main_thread()->message_loop()) {
ChildProcess::current()->main_thread()->sync_message_filter()->Send(
new GpuHostMsg_OnLogMessage(severity, header, message));
@@ -127,7 +127,7 @@ void GpuChildThread::OnInitialize() {
if (dead_on_arrival_) {
VLOG(1) << "Exiting GPU process due to errors during initialization";
- MessageLoop::current()->Quit();
+ base::MessageLoop::current()->Quit();
return;
}
@@ -193,7 +193,7 @@ void GpuChildThread::OnCollectGraphicsInfo() {
#if defined(OS_WIN)
if (!in_browser_process_) {
// The unsandboxed GPU process fulfilled its duty. Rest in peace.
- MessageLoop::current()->Quit();
+ base::MessageLoop::current()->Quit();
}
#endif // OS_WIN
}
diff --git a/content/gpu/gpu_info_collector_win.cc b/content/gpu/gpu_info_collector_win.cc
index c085681..402a4b1 100644
--- a/content/gpu/gpu_info_collector_win.cc
+++ b/content/gpu/gpu_info_collector_win.cc
@@ -604,7 +604,7 @@ bool CollectBasicGraphicsInfo(content::GPUInfo* gpu_info) {
// Collect basic information about supported D3D11 features. Delay for 45
// seconds so as not to regress performance tests.
if (D3D11ShouldWork(*gpu_info)) {
- MessageLoop::current()->PostDelayedTask(
+ base::MessageLoop::current()->PostDelayedTask(
FROM_HERE,
base::Bind(&CollectD3D11Support),
base::TimeDelta::FromSeconds(45));
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 7b45e54..6c1045f 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -107,7 +107,7 @@ int GpuMain(const MainFunctionParams& parameters) {
// GpuMsg_Initialize message from the browser.
bool dead_on_arrival = false;
- MessageLoop::Type message_loop_type = MessageLoop::TYPE_IO;
+ base::MessageLoop::Type message_loop_type = base::MessageLoop::TYPE_IO;
#if defined(OS_WIN)
// Unless we're running on desktop GL, we don't need a UI message
// loop, so avoid its use to work around apparent problems with some
@@ -115,13 +115,13 @@ int GpuMain(const MainFunctionParams& parameters) {
if (command_line.HasSwitch(switches::kUseGL) &&
command_line.GetSwitchValueASCII(switches::kUseGL) ==
gfx::kGLImplementationDesktopName) {
- message_loop_type = MessageLoop::TYPE_UI;
+ message_loop_type = base::MessageLoop::TYPE_UI;
}
#elif defined(OS_LINUX)
- message_loop_type = MessageLoop::TYPE_DEFAULT;
+ message_loop_type = base::MessageLoop::TYPE_DEFAULT;
#endif
- MessageLoop main_message_loop(message_loop_type);
+ base::MessageLoop main_message_loop(message_loop_type);
base::PlatformThread::SetName("CrGpuMain");
// In addition to disabling the watchdog if the command line switch is
diff --git a/content/gpu/gpu_watchdog_thread.cc b/content/gpu/gpu_watchdog_thread.cc
index bbca3e9..09e710e 100644
--- a/content/gpu/gpu_watchdog_thread.cc
+++ b/content/gpu/gpu_watchdog_thread.cc
@@ -25,7 +25,7 @@ const int64 kCheckPeriodMs = 2000;
GpuWatchdogThread::GpuWatchdogThread(int timeout)
: base::Thread("Watchdog"),
- watched_message_loop_(MessageLoop::current()),
+ watched_message_loop_(base::MessageLoop::current()),
timeout_(base::TimeDelta::FromMilliseconds(timeout)),
armed_(false),
#if defined(OS_WIN)
diff --git a/content/gpu/gpu_watchdog_thread.h b/content/gpu/gpu_watchdog_thread.h
index 49c6236..22cc887 100644
--- a/content/gpu/gpu_watchdog_thread.h
+++ b/content/gpu/gpu_watchdog_thread.h
@@ -38,7 +38,7 @@ class GpuWatchdogThread : public base::Thread,
// An object of this type intercepts the reception and completion of all tasks
// on the watched thread and checks whether the watchdog is armed.
- class GpuWatchdogTaskObserver : public MessageLoop::TaskObserver {
+ class GpuWatchdogTaskObserver : public base::MessageLoop::TaskObserver {
public:
explicit GpuWatchdogTaskObserver(GpuWatchdogThread* watchdog);
virtual ~GpuWatchdogTaskObserver();
@@ -62,7 +62,7 @@ class GpuWatchdogThread : public base::Thread,
base::TimeDelta GetWatchedThreadTime();
#endif
- MessageLoop* watched_message_loop_;
+ base::MessageLoop* watched_message_loop_;
base::TimeDelta timeout_;
volatile bool armed_;
GpuWatchdogTaskObserver task_observer_;