diff options
| author | tfarina <tfarina@chromium.org> | 2015-10-29 05:50:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-29 12:51:20 +0000 |
| commit | df856e02c830fb37ca5afceac7a12b4bddf37a84 (patch) | |
| tree | 61983bf3545c61f167673bdd1c8b19084bfe3472 /content/common/gpu/gpu_channel.cc | |
| parent | 69a0876721e24f35ba1f7c6338ed07ca684f5cb1 (diff) | |
| download | chromium_src-df856e02c830fb37ca5afceac7a12b4bddf37a84.zip chromium_src-df856e02c830fb37ca5afceac7a12b4bddf37a84.tar.gz chromium_src-df856e02c830fb37ca5afceac7a12b4bddf37a84.tar.bz2 | |
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}
Diffstat (limited to 'content/common/gpu/gpu_channel.cc')
| -rw-r--r-- | content/common/gpu/gpu_channel.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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<gfx::GLImage> GpuChannel::CreateImageForGpuMemoryBuffer( +scoped_refptr<gl::GLImage> 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<gfx::GLImageSharedMemory> image( - new gfx::GLImageSharedMemory(size, internalformat)); + scoped_refptr<gl::GLImageSharedMemory> image( + new gl::GLImageSharedMemory(size, internalformat)); if (!image->Initialize(handle.handle, handle.id, format, handle.offset)) return nullptr; |