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

Unified Diff: content/gpu/gpu_main.cc

Issue 1389133002: content: Use type-parameterized tests for GpuMemoryBuffer implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
Index: content/gpu/gpu_main.cc
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index e7ce06e5a26c77121d07c5db178ceba7c8a250c7..dbc7cb78f888e80135bace85a81a5a7507b6e97a 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -361,9 +361,13 @@ int GpuMain(const MainFunctionParams& parameters) {
logging::SetLogMessageHandler(NULL);
- scoped_ptr<GpuMemoryBufferFactory> gpu_memory_buffer_factory =
- GpuMemoryBufferFactory::Create(
- GpuChildThread::GetGpuMemoryBufferFactoryType());
+ gfx::GpuMemoryBufferType native_gpu_memory_buffer_factory_type =
+ GpuMemoryBufferFactory::GetNativeType();
+ scoped_ptr<GpuMemoryBufferFactory> gpu_memory_buffer_factory;
+ if (native_gpu_memory_buffer_factory_type != gfx::EMPTY_BUFFER) {
+ gpu_memory_buffer_factory =
+ GpuMemoryBufferFactory::Create(native_gpu_memory_buffer_factory_type);
+ }
gpu::SyncPointManager sync_point_manager(false);
GpuProcess gpu_process;

Powered by Google App Engine
This is Rietveld 408576698