From df856e02c830fb37ca5afceac7a12b4bddf37a84 Mon Sep 17 00:00:00 2001 From: tfarina Date: Thu, 29 Oct 2015 05:50:45 -0700 Subject: ui/gl: Move GLImage into gl namespace. BUG=461575 R=piman@chromium.org,sievers@chromium.org, TBR=fsamuel@chromium.org CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1421903006 Cr-Commit-Position: refs/heads/master@{#356825} --- content/common/gpu/gpu_channel.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'content/common/gpu/gpu_channel.cc') diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc index 2ef4571..746bc11 100644 --- a/content/common/gpu/gpu_channel.cc +++ b/content/common/gpu/gpu_channel.cc @@ -1033,15 +1033,15 @@ uint64 GpuChannel::GetMemoryUsage() { return size; } -scoped_refptr GpuChannel::CreateImageForGpuMemoryBuffer( +scoped_refptr GpuChannel::CreateImageForGpuMemoryBuffer( const gfx::GpuMemoryBufferHandle& handle, const gfx::Size& size, gfx::BufferFormat format, uint32 internalformat) { switch (handle.type) { case gfx::SHARED_MEMORY_BUFFER: { - scoped_refptr image( - new gfx::GLImageSharedMemory(size, internalformat)); + scoped_refptr image( + new gl::GLImageSharedMemory(size, internalformat)); if (!image->Initialize(handle.handle, handle.id, format, handle.offset)) return nullptr; -- cgit v1.1