summaryrefslogtreecommitdiffstats
path: root/content/gpu/gpu_main.cc
diff options
context:
space:
mode:
authorreveman <reveman@chromium.org>2015-10-07 13:26:32 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-07 20:27:47 +0000
commitfb8c8e10d21c0f784084fd043c4179ff94457d9b (patch)
treeddcd8481ee8063f2297b632e3ce53fe912738651 /content/gpu/gpu_main.cc
parent3b63eb5da72c89da888513370c07d38de679ee9b (diff)
downloadchromium_src-fb8c8e10d21c0f784084fd043c4179ff94457d9b.zip
chromium_src-fb8c8e10d21c0f784084fd043c4179ff94457d9b.tar.gz
chromium_src-fb8c8e10d21c0f784084fd043c4179ff94457d9b.tar.bz2
content: Use type-parameterized tests for GpuMemoryBuffer implementations.
This makes it easier to add type specific tests and cleans up a lot of code as a factory implementation is not longer needed for shared memory. BUG=538325 Review URL: https://codereview.chromium.org/1389133002 Cr-Commit-Position: refs/heads/master@{#352930}
Diffstat (limited to 'content/gpu/gpu_main.cc')
-rw-r--r--content/gpu/gpu_main.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index e7ce06e..d27ef2b 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -361,9 +361,10 @@ int GpuMain(const MainFunctionParams& parameters) {
logging::SetLogMessageHandler(NULL);
- scoped_ptr<GpuMemoryBufferFactory> gpu_memory_buffer_factory =
- GpuMemoryBufferFactory::Create(
- GpuChildThread::GetGpuMemoryBufferFactoryType());
+ scoped_ptr<GpuMemoryBufferFactory> gpu_memory_buffer_factory;
+ if (GpuMemoryBufferFactory::GetNativeType() != gfx::EMPTY_BUFFER)
+ gpu_memory_buffer_factory = GpuMemoryBufferFactory::CreateNativeType();
+
gpu::SyncPointManager sync_point_manager(false);
GpuProcess gpu_process;