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

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

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.h
diff --git a/content/common/gpu/gpu_memory_buffer_factory_surface_texture.h b/content/common/gpu/gpu_memory_buffer_factory_surface_texture.h
index 1696df3d3315207269064c77ae532174e4d814fd..b9eda55dcbdeb8227dd785c68e5c09597866b50d 100644
--- a/content/common/gpu/gpu_memory_buffer_factory_surface_texture.h
+++ b/content/common/gpu/gpu_memory_buffer_factory_surface_texture.h
@@ -17,10 +17,13 @@
#include "ui/gfx/gpu_memory_buffer.h"
namespace gfx {
-class GLImage;
class SurfaceTexture;
}
+namespace gl {
+class GLImage;
+}
+
namespace content {
class CONTENT_EXPORT GpuMemoryBufferFactorySurfaceTexture
@@ -52,7 +55,7 @@ class CONTENT_EXPORT GpuMemoryBufferFactorySurfaceTexture
gpu::ImageFactory* AsImageFactory() override;
// Overridden from gpu::ImageFactory:
- scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer(
+ scoped_refptr<gl::GLImage> CreateImageForGpuMemoryBuffer(
const gfx::GpuMemoryBufferHandle& handle,
const gfx::Size& size,
gfx::BufferFormat format,

Powered by Google App Engine
This is Rietveld 408576698