Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(575)

Unified Diff: content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc

Issue 1421903006: ui/gl: Move GLImage into gl namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ozone demo Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc
diff --git a/content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc b/content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc
index 9fb631d6f850907472274753bbc41972caf8aae9..a9913c84c80c48735fa6341f1562a7a05dfc05d2 100644
--- a/content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc
+++ b/content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc
@@ -97,7 +97,7 @@ gpu::ImageFactory* GpuMemoryBufferFactorySurfaceTexture::AsImageFactory() {
return this;
}
-scoped_refptr<gfx::GLImage>
+scoped_refptr<gl::GLImage>
GpuMemoryBufferFactorySurfaceTexture::CreateImageForGpuMemoryBuffer(
const gfx::GpuMemoryBufferHandle& handle,
const gfx::Size& size,
@@ -111,12 +111,12 @@ GpuMemoryBufferFactorySurfaceTexture::CreateImageForGpuMemoryBuffer(
SurfaceTextureMapKey key(handle.id.id, client_id);
SurfaceTextureMap::iterator it = surface_textures_.find(key);
if (it == surface_textures_.end())
- return scoped_refptr<gfx::GLImage>();
+ return scoped_refptr<gl::GLImage>();
- scoped_refptr<gfx::GLImageSurfaceTexture> image(
- new gfx::GLImageSurfaceTexture(size));
+ scoped_refptr<gl::GLImageSurfaceTexture> image(
+ new gl::GLImageSurfaceTexture(size));
if (!image->Initialize(it->second.get()))
- return scoped_refptr<gfx::GLImage>();
+ return scoped_refptr<gl::GLImage>();
return image;
}

Powered by Google App Engine
This is Rietveld 408576698