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

Unified Diff: content/gpu/in_process_gpu_thread.cc

Issue 1389133002: content: Use type-parameterized tests for GpuMemoryBuffer implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add blankline 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
« no previous file with comments | « content/gpu/gpu_main.cc ('k') | content/test/gpu_memory_buffer_factory_test_template.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/in_process_gpu_thread.cc
diff --git a/content/gpu/in_process_gpu_thread.cc b/content/gpu/in_process_gpu_thread.cc
index e4149db9e126a2e132fdfc0058f5c451c3b6826d..bd9ef94fcf87a0a2cc6ebf01db857116ae1fc79c 100644
--- a/content/gpu/in_process_gpu_thread.cc
+++ b/content/gpu/in_process_gpu_thread.cc
@@ -18,8 +18,10 @@ InProcessGpuThread::InProcessGpuThread(
params_(params),
gpu_process_(NULL),
sync_point_manager_override_(sync_point_manager_override),
- gpu_memory_buffer_factory_(GpuMemoryBufferFactory::Create(
- GpuChildThread::GetGpuMemoryBufferFactoryType())) {
+ gpu_memory_buffer_factory_(
+ GpuMemoryBufferFactory::GetNativeType() != gfx::EMPTY_BUFFER
+ ? GpuMemoryBufferFactory::CreateNativeType()
+ : nullptr) {
if (!sync_point_manager_override_) {
sync_point_manager_.reset(new gpu::SyncPointManager(false));
sync_point_manager_override_ = sync_point_manager_.get();
« no previous file with comments | « content/gpu/gpu_main.cc ('k') | content/test/gpu_memory_buffer_factory_test_template.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698