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

Unified Diff: content/gpu/gpu_main.cc

Issue 1210703002: content: Make sure all CreateGpuMemoryBuffer messages are handled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: avoid use of g_thread_safe_sender 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.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_main.cc
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index cae99f601502d01dc839b4f7997f03b5dfcf921d..f520aebfa7a22ab2609124771fbac7f7eb8071b8 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -23,6 +23,7 @@
#include "content/child/child_process.h"
#include "content/common/content_constants_internal.h"
#include "content/common/gpu/gpu_config.h"
+#include "content/common/gpu/gpu_memory_buffer_factory.h"
#include "content/common/gpu/gpu_messages.h"
#include "content/common/gpu/media/gpu_video_decode_accelerator.h"
#include "content/common/gpu/media/gpu_video_encode_accelerator.h"
@@ -364,12 +365,18 @@ int GpuMain(const MainFunctionParams& parameters) {
logging::SetLogMessageHandler(NULL);
+ std::vector<gfx::GpuMemoryBufferType> supported_types;
+ GpuMemoryBufferFactory::GetSupportedTypes(&supported_types);
+ DCHECK(!supported_types.empty());
+ // Note: We always use the preferred type.
+ scoped_ptr<GpuMemoryBufferFactory> gpu_memory_buffer_factory =
+ GpuMemoryBufferFactory::Create(supported_types[0]);
+
GpuProcess gpu_process;
- GpuChildThread* child_thread = new GpuChildThread(watchdog_thread.get(),
- dead_on_arrival,
- gpu_info,
- deferred_messages.Get());
+ GpuChildThread* child_thread = new GpuChildThread(
+ watchdog_thread.get(), dead_on_arrival, gpu_info, deferred_messages.Get(),
+ gpu_memory_buffer_factory.get());
while (!deferred_messages.Get().empty())
deferred_messages.Get().pop();
« no previous file with comments | « content/gpu/gpu_child_thread.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698