| Index: components/exo/shared_memory.cc
|
| diff --git a/components/exo/shared_memory.cc b/components/exo/shared_memory.cc
|
| index d0b2176c36b2503f7cb1f3af6695c24eb5fdc33b..4b6f6806c7598dca0aeb56be88f0011328cad2f6 100644
|
| --- a/components/exo/shared_memory.cc
|
| +++ b/components/exo/shared_memory.cc
|
| @@ -13,9 +13,8 @@
|
| #include "base/memory/ptr_util.h"
|
| #include "base/trace_event/trace_event.h"
|
| #include "components/exo/buffer.h"
|
| -#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
|
| +#include "gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.h"
|
| #include "third_party/khronos/GLES2/gl2.h"
|
| -#include "ui/aura/env.h"
|
| #include "ui/compositor/compositor.h"
|
| #include "ui/gfx/buffer_format_util.h"
|
| #include "ui/gfx/geometry/size.h"
|
| @@ -70,10 +69,9 @@ std::unique_ptr<Buffer> SharedMemory::CreateBuffer(const gfx::Size& size,
|
| handle.stride = stride;
|
|
|
| std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer =
|
| - aura::Env::GetInstance()
|
| - ->context_factory()
|
| - ->GetGpuMemoryBufferManager()
|
| - ->CreateGpuMemoryBufferFromHandle(handle, size, format);
|
| + gpu::GpuMemoryBufferImplSharedMemory::CreateFromHandle(
|
| + handle, size, format, gfx::BufferUsage::GPU_READ,
|
| + gpu::GpuMemoryBufferImpl::DestructionCallback());
|
| if (!gpu_memory_buffer) {
|
| LOG(ERROR) << "Failed to create GpuMemoryBuffer from handle";
|
| return nullptr;
|
|
|