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

Unified Diff: gpu/ipc/service/gpu_memory_buffer_factory.cc

Issue 2781293003: gpu: Have GpuService create and own GpuMemoryBufferFactory. (Closed)
Patch Set: . Created 3 years, 9 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/in_process_gpu_thread.cc ('k') | services/ui/gpu/gpu_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/ipc/service/gpu_memory_buffer_factory.cc
diff --git a/gpu/ipc/service/gpu_memory_buffer_factory.cc b/gpu/ipc/service/gpu_memory_buffer_factory.cc
index d3dbb554a7e3e4824003d6cd774393a17643f386..2936fe33d51da7e75a0c99e88a9cc55d39d29ca5 100644
--- a/gpu/ipc/service/gpu_memory_buffer_factory.cc
+++ b/gpu/ipc/service/gpu_memory_buffer_factory.cc
@@ -7,6 +7,7 @@
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "build/build_config.h"
+#include "gpu/ipc/common/gpu_memory_buffer_support.h"
reveman 2017/03/31 13:38:38 no need for this after removing the lines below:
sadrul 2017/04/02 02:50:50 Done.
#if defined(OS_MACOSX)
#include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h"
@@ -21,13 +22,14 @@ namespace gpu {
// static
std::unique_ptr<GpuMemoryBufferFactory>
GpuMemoryBufferFactory::CreateNativeType() {
+ if (GetNativeGpuMemoryBufferType() == gfx::EMPTY_BUFFER)
+ return nullptr;
reveman 2017/03/31 13:38:38 remove these two lines now that it's fine to retur
sadrul 2017/04/02 02:50:50 Done. Also, updated the doc to say that this can r
#if defined(OS_MACOSX)
return base::WrapUnique(new GpuMemoryBufferFactoryIOSurface);
#endif
#if defined(USE_OZONE)
return base::WrapUnique(new GpuMemoryBufferFactoryOzoneNativePixmap);
#endif
- NOTREACHED();
return nullptr;
}
« no previous file with comments | « content/gpu/in_process_gpu_thread.cc ('k') | services/ui/gpu/gpu_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698