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

Unified Diff: gpu/command_buffer/service/texture_manager.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: gpu/command_buffer/service/texture_manager.h
diff --git a/gpu/command_buffer/service/texture_manager.h b/gpu/command_buffer/service/texture_manager.h
index 33cd54ad225b682f962f69e169f49e67c94cef86..dfc6a8a2a5624b4b0f9547cb413285543f113954 100644
--- a/gpu/command_buffer/service/texture_manager.h
+++ b/gpu/command_buffer/service/texture_manager.h
@@ -152,15 +152,15 @@ class GPU_EXPORT Texture {
// Set the image for a particular level.
void SetLevelImage(GLenum target,
GLint level,
- gfx::GLImage* image,
+ gl::GLImage* image,
ImageState state);
// Get the image associated with a particular level. Returns NULL if level
// does not exist.
- gfx::GLImage* GetLevelImage(GLint target,
- GLint level,
- ImageState* state) const;
- gfx::GLImage* GetLevelImage(GLint target, GLint level) const;
+ gl::GLImage* GetLevelImage(GLint target,
+ GLint level,
+ ImageState* state) const;
+ gl::GLImage* GetLevelImage(GLint target, GLint level) const;
bool HasImages() const {
return has_images_;
@@ -263,7 +263,7 @@ class GPU_EXPORT Texture {
GLint border;
GLenum format;
GLenum type;
- scoped_refptr<gfx::GLImage> image;
+ scoped_refptr<gl::GLImage> image;
ImageState image_state;
uint32 estimated_size;
};
@@ -809,7 +809,7 @@ class GPU_EXPORT TextureManager : public base::trace_event::MemoryDumpProvider {
void SetLevelImage(TextureRef* ref,
GLenum target,
GLint level,
- gfx::GLImage* image,
+ gl::GLImage* image,
Texture::ImageState state);
size_t GetSignatureSize() const;

Powered by Google App Engine
This is Rietveld 408576698