| Index: content/browser/gpu/browser_gpu_channel_host_factory.cc
|
| diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.cc b/content/browser/gpu/browser_gpu_channel_host_factory.cc
|
| index 075c8f993f5da2332a185895ee210b8e68d8155c..150033ee2e356473391b80a7c3338ab1cfa11f8f 100644
|
| --- a/content/browser/gpu/browser_gpu_channel_host_factory.cc
|
| +++ b/content/browser/gpu/browser_gpu_channel_host_factory.cc
|
| @@ -18,6 +18,10 @@
|
| #include "content/public/common/content_client.h"
|
| #include "ipc/ipc_forwarding_message_filter.h"
|
|
|
| +#if defined(OS_LINUX)
|
| +#include "content/common/gpu/client/gpu_memory_buffer_impl_intel_drm.h"
|
| +#endif
|
| +
|
| namespace content {
|
|
|
| BrowserGpuChannelHostFactory* BrowserGpuChannelHostFactory::instance_ = NULL;
|
| @@ -379,6 +383,21 @@ scoped_ptr<gfx::GpuMemoryBuffer>
|
| if (!GpuMemoryBufferImpl::IsFormatValid(internalformat))
|
| return scoped_ptr<gfx::GpuMemoryBuffer>();
|
|
|
| +#if defined(OS_LINUX)
|
| + if (!GpuMemoryBufferImplIntelDRM::IsFormatSupported(internalformat)) {
|
| + drm_intel_bo* buffer_object =
|
| + GpuMemoryBufferImplIntelDRM::CreateBufferObject(
|
| + gfx::Size(width, height), internalformat);
|
| + if (buffer_object) {
|
| + scoped_ptr<GpuMemoryBufferImplIntelDRM> buffer(
|
| + new GpuMemoryBufferImplIntelDRM(gfx::Size(width, height),
|
| + internalformat));
|
| + if (!buffer->InitializeFromBufferObject(buffer_object))
|
| + return buffer.PassAs<gfx::GpuMemoryBuffer>();
|
| + }
|
| + }
|
| +#endif
|
| +
|
| size_t size = width * height *
|
| GpuMemoryBufferImpl::BytesPerPixel(internalformat);
|
| scoped_ptr<base::SharedMemory> shm(new base::SharedMemory());
|
|
|