Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(168)

Unified Diff: content/gpu/gpu_child_thread.cc

Issue 16294003: Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common_child/webblobregistry_impl.cc ('k') | content/gpu/gpu_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_child_thread.cc
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
index c523550533a6538766eb2c185cbc4aefdaecabc4..451e31c44adf44ebf6b1190f3db3dad4f4f962d7 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())
« no previous file with comments | « content/common_child/webblobregistry_impl.cc ('k') | content/gpu/gpu_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698