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

Unified Diff: ui/compositor/test/in_process_context_factory.cc

Issue 496313004: Remove implicit conversions from scoped_refptr to T* in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 | « ui/compositor/layer_unittest.cc ('k') | ui/gl/gl_fence_arb.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/test/in_process_context_factory.cc
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc
index f680e991991c8f80bc61ed975c30bab6a82b3831..fa2380fc242a7f9c2e188ecc5a4e0137358c9f70 100644
--- a/ui/compositor/test/in_process_context_factory.cc
+++ b/ui/compositor/test/in_process_context_factory.cc
@@ -73,7 +73,7 @@ void InProcessContextFactory::RemoveReflector(
scoped_refptr<cc::ContextProvider>
InProcessContextFactory::SharedMainThreadContextProvider() {
- if (shared_main_thread_contexts_ &&
+ if (shared_main_thread_contexts_.get() &&
!shared_main_thread_contexts_->DestroyedOnMainThread())
return shared_main_thread_contexts_;
@@ -81,7 +81,7 @@ InProcessContextFactory::SharedMainThreadContextProvider() {
shared_main_thread_contexts_ =
webkit::gpu::ContextProviderInProcess::CreateOffscreen(
lose_context_when_out_of_memory);
- if (shared_main_thread_contexts_ &&
+ if (shared_main_thread_contexts_.get() &&
!shared_main_thread_contexts_->BindToCurrentThread())
shared_main_thread_contexts_ = NULL;
@@ -99,7 +99,7 @@ cc::SharedBitmapManager* InProcessContextFactory::GetSharedBitmapManager() {
base::MessageLoopProxy* InProcessContextFactory::GetCompositorMessageLoop() {
if (!compositor_thread_)
return NULL;
- return compositor_thread_->message_loop_proxy();
+ return compositor_thread_->message_loop_proxy().get();
danakj 2014/08/25 18:50:48 If I understood your question right, I agree this
}
} // namespace ui
« no previous file with comments | « ui/compositor/layer_unittest.cc ('k') | ui/gl/gl_fence_arb.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698