Index: content/gpu/gpu_child_thread.cc |
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc |
index 5b8e22d15fae1d81f3856f4c63f6ab407b5cfe8f..b3d9ba037abcd08dfe7e922a6e9ec2ee714fa07c 100644 |
--- a/content/gpu/gpu_child_thread.cc |
+++ b/content/gpu/gpu_child_thread.cc |
@@ -57,9 +57,6 @@ |
namespace content { |
namespace { |
-base::LazyInstance<base::ThreadLocalPointer<GpuChildThread>> g_lazy_tls = |
- LAZY_INSTANCE_INITIALIZER; |
- |
static base::LazyInstance<scoped_refptr<ThreadSafeSender> > |
g_thread_safe_sender = LAZY_INSTANCE_INITIALIZER; |
@@ -144,11 +141,6 @@ ChildThreadImpl::Options GetOptions( |
} // namespace |
-// static |
-GpuChildThread* GpuChildThread::current() { |
- return g_lazy_tls.Pointer()->Get(); |
-} |
- |
GpuChildThread::GpuChildThread( |
GpuWatchdogThread* watchdog_thread, |
bool dead_on_arrival, |
@@ -166,7 +158,6 @@ GpuChildThread::GpuChildThread( |
target_services_ = NULL; |
#endif |
g_thread_safe_sender.Get() = thread_safe_sender(); |
- g_lazy_tls.Pointer()->Set(this); |
} |
GpuChildThread::GpuChildThread( |
@@ -195,7 +186,6 @@ GpuChildThread::GpuChildThread( |
VLOG(1) << "gl::init::InitializeGLOneOff failed"; |
g_thread_safe_sender.Get() = thread_safe_sender(); |
- g_lazy_tls.Pointer()->Set(this); |
} |
GpuChildThread::~GpuChildThread() { |
@@ -203,7 +193,6 @@ GpuChildThread::~GpuChildThread() { |
delete deferred_messages_.front(); |
deferred_messages_.pop(); |
} |
- g_lazy_tls.Pointer()->Set(nullptr); |
} |
void GpuChildThread::Shutdown() { |
@@ -403,7 +392,7 @@ void GpuChildThread::OnInitialize(const gpu::GpuPreferences& gpu_preferences) { |
if (GetContentClient()->gpu()) { // NULL in tests. |
GetContentClient()->gpu()->ExposeInterfacesToBrowser( |
- GetInterfaceRegistry()); |
+ GetInterfaceRegistry(), gpu_preferences_); |
} |
GetInterfaceRegistry()->ResumeBinding(); |