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

Unified Diff: content/gpu/gpu_child_thread.cc

Issue 2171473003: Remove content::GpuVideoDecodeAcceleratorFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gpu_init_order
Patch Set: rebase Created 4 years, 5 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/gpu/gpu_child_thread.h ('k') | content/public/gpu/BUILD.gn » ('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 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();
« no previous file with comments | « content/gpu/gpu_child_thread.h ('k') | content/public/gpu/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698