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

Unified Diff: ui/gl/gl_image_egl.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_image_egl.h
diff --git a/ui/gl/gl_image_egl.h b/ui/gl/gl_image_egl.h
index 4110fd0d244473e32b9f898c2d5ee87e23adcda2..bb68e108ea0b16778a99952e4de8d3c1cff2a804 100644
--- a/ui/gl/gl_image_egl.h
+++ b/ui/gl/gl_image_egl.h
@@ -9,41 +9,41 @@
#include "ui/gl/gl_bindings.h"
#include "ui/gl/gl_image.h"
-namespace gfx {
+namespace gl {
class GL_EXPORT GLImageEGL : public GLImage {
public:
- explicit GLImageEGL(const Size& size);
+ explicit GLImageEGL(const gfx::Size& size);
bool Initialize(EGLenum target, EGLClientBuffer buffer, const EGLint* attrs);
// Overridden from GLImage:
void Destroy(bool have_context) override;
- Size GetSize() override;
+ gfx::Size GetSize() override;
unsigned GetInternalFormat() override;
bool BindTexImage(unsigned target) override;
void ReleaseTexImage(unsigned target) override {}
bool CopyTexImage(unsigned target) override;
bool CopyTexSubImage(unsigned target,
- const Point& offset,
- const Rect& rect) override;
- bool ScheduleOverlayPlane(AcceleratedWidget widget,
+ const gfx::Point& offset,
+ const gfx::Rect& rect) override;
+ bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
int z_order,
- OverlayTransform transform,
- const Rect& bounds_rect,
- const RectF& crop_rect) override;
+ gfx::OverlayTransform transform,
+ const gfx::Rect& bounds_rect,
+ const gfx::RectF& crop_rect) override;
protected:
~GLImageEGL() override;
EGLImageKHR egl_image_;
- const Size size_;
+ const gfx::Size size_;
base::ThreadChecker thread_checker_;
private:
DISALLOW_COPY_AND_ASSIGN(GLImageEGL);
};
-} // namespace gfx
+} // namespace gl
#endif // UI_GL_GL_IMAGE_EGL_H_
« no previous file with comments | « ui/gl/gl_image.h ('k') | ui/gl/gl_image_egl.cc » ('j') | ui/gl/test/gl_image_test_template.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698