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

Unified Diff: content/gpu/gpu_child_thread.cc

Issue 1210073003: Revert of content: Fix single process support for native GpuMemoryBuffers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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/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 7d7ffe8f0aca8ebac8189825b8d55b2b02a6943e..3a4216bebf246b2c096234e9d7e2e8584a87e938 100644
--- a/content/gpu/gpu_child_thread.cc
+++ b/content/gpu/gpu_child_thread.cc
@@ -130,17 +130,13 @@
g_thread_safe_sender.Get() = thread_safe_sender();
}
-GpuChildThread::GpuChildThread(
- const InProcessChildThreadParams& params,
- GpuMemoryBufferFactory* gpu_memory_buffer_factory)
+GpuChildThread::GpuChildThread(const InProcessChildThreadParams& params)
: ChildThreadImpl(ChildThreadImpl::Options::Builder()
.InBrowserProcess(params)
- .AddStartupFilter(new GpuMemoryBufferMessageFilter(
- gpu_memory_buffer_factory))
.Build()),
dead_on_arrival_(false),
in_browser_process_(true),
- gpu_memory_buffer_factory_(gpu_memory_buffer_factory) {
+ gpu_memory_buffer_factory_(nullptr) {
#if defined(OS_WIN)
target_services_ = NULL;
#endif
@@ -156,15 +152,6 @@
}
GpuChildThread::~GpuChildThread() {
-}
-
-// static
-gfx::GpuMemoryBufferType GpuChildThread::GetGpuMemoryBufferFactoryType() {
- std::vector<gfx::GpuMemoryBufferType> supported_types;
- GpuMemoryBufferFactory::GetSupportedTypes(&supported_types);
- DCHECK(!supported_types.empty());
- // Note: We always use the preferred type.
- return supported_types[0];
}
void GpuChildThread::Shutdown() {
« no previous file with comments | « content/gpu/gpu_child_thread.h ('k') | content/gpu/gpu_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698