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; |
} |