summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/service/in_process_command_buffer.cc
diff options
context:
space:
mode:
authortfarina <tfarina@chromium.org>2015-10-29 05:50:45 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-29 12:51:20 +0000
commitdf856e02c830fb37ca5afceac7a12b4bddf37a84 (patch)
tree61983bf3545c61f167673bdd1c8b19084bfe3472 /gpu/command_buffer/service/in_process_command_buffer.cc
parent69a0876721e24f35ba1f7c6338ed07ca684f5cb1 (diff)
downloadchromium_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 'gpu/command_buffer/service/in_process_command_buffer.cc')
-rw-r--r--gpu/command_buffer/service/in_process_command_buffer.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/gpu/command_buffer/service/in_process_command_buffer.cc b/gpu/command_buffer/service/in_process_command_buffer.cc
index 77647ef..3b5f9d0 100644
--- a/gpu/command_buffer/service/in_process_command_buffer.cc
+++ b/gpu/command_buffer/service/in_process_command_buffer.cc
@@ -712,8 +712,8 @@ void InProcessCommandBuffer::CreateImageOnGpuThread(
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)) {
LOG(ERROR) << "Failed to initialize image.";
return;
@@ -731,7 +731,7 @@ void InProcessCommandBuffer::CreateImageOnGpuThread(
// Note: this assumes that client ID is always 0.
const int kClientId = 0;
- scoped_refptr<gfx::GLImage> image =
+ scoped_refptr<gl::GLImage> image =
image_factory_->CreateImageForGpuMemoryBuffer(
handle, size, format, internalformat, kClientId);
if (!image.get()) {