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

Unified Diff: ui/gl/gl_surface.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: ui/gl/gl_surface.h
diff --git a/ui/gl/gl_surface.h b/ui/gl/gl_surface.h
index 5d98253910d4993e51517e0d68a344f0d016bff8..b928c6784730c9c81f297c7273dbb9d01b209275 100644
--- a/ui/gl/gl_surface.h
+++ b/ui/gl/gl_surface.h
@@ -19,10 +19,13 @@
#include "ui/gl/gl_export.h"
#include "ui/gl/gl_implementation.h"
+namespace gl {
+class GLImage;
+}
+
namespace gfx {
class GLContext;
-class GLImage;
class VSyncProvider;
// Encapsulates a surface that can be rendered to with GL, hiding platform
@@ -137,7 +140,7 @@ class GL_EXPORT GLSurface : public base::RefCounted<GLSurface> {
// |bounds_rect|.
virtual bool ScheduleOverlayPlane(int z_order,
OverlayTransform transform,
- GLImage* image,
+ gl::GLImage* image,
const Rect& bounds_rect,
const RectF& crop_rect);
@@ -218,7 +221,7 @@ class GL_EXPORT GLSurfaceAdapter : public GLSurface {
VSyncProvider* GetVSyncProvider() override;
bool ScheduleOverlayPlane(int z_order,
OverlayTransform transform,
- GLImage* image,
+ gl::GLImage* image,
const Rect& bounds_rect,
const RectF& crop_rect) override;
bool IsSurfaceless() const override;

Powered by Google App Engine
This is Rietveld 408576698