Index: gpu/ipc/client/command_buffer_proxy_impl.cc |
diff --git a/gpu/ipc/client/command_buffer_proxy_impl.cc b/gpu/ipc/client/command_buffer_proxy_impl.cc |
index 34731027fbd7dfb1cd722a7e372ac85402b3e853..07fc6364388dd7f5162fc442b887cecaa4ffcf5a 100644 |
--- a/gpu/ipc/client/command_buffer_proxy_impl.cc |
+++ b/gpu/ipc/client/command_buffer_proxy_impl.cc |
@@ -18,8 +18,8 @@ |
#include "gpu/command_buffer/common/command_buffer_id.h" |
#include "gpu/command_buffer/common/command_buffer_shared.h" |
#include "gpu/command_buffer/common/gpu_memory_allocation.h" |
+#include "gpu/command_buffer/common/gpu_memory_buffer_support.h" |
#include "gpu/command_buffer/common/sync_token.h" |
-#include "gpu/command_buffer/service/image_factory.h" |
#include "gpu/ipc/client/gpu_channel_host.h" |
#include "gpu/ipc/common/gpu_messages.h" |
#include "gpu/ipc/common/gpu_param_traits.h" |
@@ -430,11 +430,11 @@ int32_t CommandBufferProxyImpl::CreateImage(ClientBuffer buffer, |
DCHECK_LE(image_fence_sync - 1, flushed_fence_sync_release_); |
} |
- DCHECK(gpu::ImageFactory::IsGpuMemoryBufferFormatSupported( |
- gpu_memory_buffer->GetFormat(), capabilities_)); |
- DCHECK(gpu::ImageFactory::IsImageSizeValidForGpuMemoryBufferFormat( |
+ DCHECK(gpu::IsGpuMemoryBufferFormatSupported(gpu_memory_buffer->GetFormat(), |
+ capabilities_)); |
+ DCHECK(gpu::IsImageSizeValidForGpuMemoryBufferFormat( |
gfx::Size(width, height), gpu_memory_buffer->GetFormat())); |
- DCHECK(gpu::ImageFactory::IsImageFormatCompatibleWithGpuMemoryBufferFormat( |
+ DCHECK(gpu::IsImageFormatCompatibleWithGpuMemoryBufferFormat( |
internal_format, gpu_memory_buffer->GetFormat())); |
GpuCommandBufferMsg_CreateImage_Params params; |
@@ -479,7 +479,7 @@ int32_t CommandBufferProxyImpl::CreateGpuMemoryBufferImage( |
scoped_ptr<gfx::GpuMemoryBuffer> buffer( |
channel_->gpu_memory_buffer_manager()->AllocateGpuMemoryBuffer( |
gfx::Size(width, height), |
- gpu::ImageFactory::DefaultBufferFormatForImageFormat(internal_format), |
+ gpu::DefaultBufferFormatForImageFormat(internal_format), |
gfx::BufferUsage::SCANOUT)); |
if (!buffer) |
return -1; |