From fc72bb18b111ff63e57135d97de6d59291f3b7b8 Mon Sep 17 00:00:00 2001 From: "rsleevi@chromium.org" Date: Sun, 2 Jun 2013 21:13:46 +0000 Subject: Update content/ to use scoped_refptr::get() rather than implicit "operator T*" Linux fixes BUG=110610 TBR=darin Review URL: https://chromiumcodereview.appspot.com/16294003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203624 0039d316-1c4b-4281-b951-d872f2087c98 --- content/gpu/gpu_child_thread.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'content/gpu/gpu_child_thread.cc') diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index c523550..451e31c 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -144,11 +144,11 @@ void GpuChildThread::OnInitialize() { // Defer creation of the render thread. This is to prevent it from handling // IPC messages before the sandbox has been enabled and all other necessary // initialization has succeeded. - gpu_channel_manager_.reset(new GpuChannelManager( - this, - watchdog_thread_, - ChildProcess::current()->io_message_loop_proxy(), - ChildProcess::current()->GetShutDownEvent())); + gpu_channel_manager_.reset( + new GpuChannelManager(this, + watchdog_thread_.get(), + ChildProcess::current()->io_message_loop_proxy(), + ChildProcess::current()->GetShutDownEvent())); // Ensure the browser process receives the GPU info before a reply to any // subsequent IPC it might send. @@ -157,7 +157,7 @@ void GpuChildThread::OnInitialize() { } void GpuChildThread::StopWatchdog() { - if (watchdog_thread_) { + if (watchdog_thread_.get()) { watchdog_thread_->Stop(); } } @@ -224,7 +224,7 @@ void GpuChildThread::OnHang() { void GpuChildThread::OnDisableWatchdog() { VLOG(1) << "GPU: Disabling watchdog thread"; - if (watchdog_thread_) { + if (watchdog_thread_.get()) { // Disarm the watchdog before shutting down the message loop. This prevents // the future posting of tasks to the message loop. if (watchdog_thread_->message_loop()) -- cgit v1.1