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

Unified Diff: ui/ozone/demo/surfaceless_gl_renderer.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
« ui/gl/test/gl_image_test_template.h ('K') | « ui/gl/test/gl_image_test_template.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/demo/surfaceless_gl_renderer.h
diff --git a/ui/ozone/demo/surfaceless_gl_renderer.h b/ui/ozone/demo/surfaceless_gl_renderer.h
index ef90885ec98e8b1797251e5d2cb3d11a7e313d6f..b23a6188b4b8b15146ca198ad38aa9de6ff96911 100644
--- a/ui/ozone/demo/surfaceless_gl_renderer.h
+++ b/ui/ozone/demo/surfaceless_gl_renderer.h
@@ -7,9 +7,9 @@
#include "ui/ozone/demo/gl_renderer.h"
-namespace gfx {
+namespace gl {
class GLImage;
-} // namespace gfx
+}
namespace ui {
@@ -33,7 +33,7 @@ class SurfacelessGlRenderer : public GlRenderer {
BufferWrapper();
~BufferWrapper();
- gfx::GLImage* image() const { return image_.get(); }
+ gl::GLImage* image() const { return image_.get(); }
bool Initialize(gfx::AcceleratedWidget widget, const gfx::Size& size);
void BindFramebuffer();
@@ -42,7 +42,7 @@ class SurfacelessGlRenderer : public GlRenderer {
gfx::AcceleratedWidget widget_ = gfx::kNullAcceleratedWidget;
gfx::Size size_;
- scoped_refptr<gfx::GLImage> image_;
+ scoped_refptr<gl::GLImage> image_;
unsigned int gl_fb_ = 0;
unsigned int gl_tex_ = 0;
};
« ui/gl/test/gl_image_test_template.h ('K') | « ui/gl/test/gl_image_test_template.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698