| Index: gpu/ipc/common/gpu_memory_buffer_support.cc
|
| diff --git a/gpu/ipc/common/gpu_memory_buffer_support.cc b/gpu/ipc/common/gpu_memory_buffer_support.cc
|
| index 73ac6b658f5f0127fd6c798f42eae15c5cca4fc9..77f98359d26a34b845720227545aeb54bdcaf1bf 100644
|
| --- a/gpu/ipc/common/gpu_memory_buffer_support.cc
|
| +++ b/gpu/ipc/common/gpu_memory_buffer_support.cc
|
| @@ -7,8 +7,8 @@
|
| #include "base/logging.h"
|
| #include "build/build_config.h"
|
|
|
| -#if defined(USE_OZONE)
|
| -#include "ui/ozone/public/client_native_pixmap_factory_ozone.h"
|
| +#if defined(OS_LINUX)
|
| +#include "ui/gfx/client_native_pixmap_factory.h"
|
| #endif
|
|
|
| namespace gpu {
|
| @@ -17,7 +17,7 @@ gfx::GpuMemoryBufferType GetNativeGpuMemoryBufferType() {
|
| #if defined(OS_MACOSX)
|
| return gfx::IO_SURFACE_BUFFER;
|
| #endif
|
| -#if defined(USE_OZONE)
|
| +#if defined(OS_LINUX)
|
| return gfx::NATIVE_PIXMAP;
|
| #endif
|
| return gfx::EMPTY_BUFFER;
|
| @@ -47,7 +47,7 @@ bool IsNativeGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format,
|
| return false;
|
| #endif
|
|
|
| -#if defined(USE_OZONE)
|
| +#if defined(OS_LINUX)
|
| if (!gfx::ClientNativePixmapFactory::GetInstance()) {
|
| // unittests don't have to set ClientNativePixmapFactory.
|
| return false;
|
|
|