Index: ui/gl/gl_image_egl.cc |
diff --git a/ui/gl/gl_image_egl.cc b/ui/gl/gl_image_egl.cc |
index 6f72c4feb2ff91edb277aeb09bc12b61bb7679cb..91800e2d90de6d108c392a0fb73a2c919ea52d21 100644 |
--- a/ui/gl/gl_image_egl.cc |
+++ b/ui/gl/gl_image_egl.cc |
@@ -7,9 +7,9 @@ |
#include "ui/gl/egl_util.h" |
#include "ui/gl/gl_surface_egl.h" |
-namespace gfx { |
+namespace gl { |
-GLImageEGL::GLImageEGL(const Size& size) |
+GLImageEGL::GLImageEGL(const gfx::Size& size) |
: egl_image_(EGL_NO_IMAGE_KHR), size_(size) {} |
GLImageEGL::~GLImageEGL() { |
@@ -22,7 +22,7 @@ bool GLImageEGL::Initialize(EGLenum target, |
const EGLint* attrs) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
DCHECK_EQ(EGL_NO_IMAGE_KHR, egl_image_); |
- egl_image_ = eglCreateImageKHR(GLSurfaceEGL::GetHardwareDisplay(), |
+ egl_image_ = eglCreateImageKHR(gfx::GLSurfaceEGL::GetHardwareDisplay(), |
EGL_NO_CONTEXT, |
target, |
buffer, |
@@ -39,7 +39,7 @@ void GLImageEGL::Destroy(bool have_context) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
if (egl_image_ != EGL_NO_IMAGE_KHR) { |
EGLBoolean result = |
- eglDestroyImageKHR(GLSurfaceEGL::GetHardwareDisplay(), egl_image_); |
+ eglDestroyImageKHR(gfx::GLSurfaceEGL::GetHardwareDisplay(), egl_image_); |
if (result == EGL_FALSE) { |
DLOG(ERROR) << "Error destroying EGLImage: " |
<< ui::GetLastEGLErrorString(); |
@@ -48,7 +48,7 @@ void GLImageEGL::Destroy(bool have_context) { |
} |
} |
-Size GLImageEGL::GetSize() { |
+gfx::Size GLImageEGL::GetSize() { |
return size_; |
} |
@@ -67,17 +67,17 @@ bool GLImageEGL::CopyTexImage(unsigned target) { |
} |
bool GLImageEGL::CopyTexSubImage(unsigned target, |
- const Point& offset, |
- const Rect& rect) { |
+ const gfx::Point& offset, |
+ const gfx::Rect& rect) { |
return false; |
} |
-bool GLImageEGL::ScheduleOverlayPlane(AcceleratedWidget widget, |
+bool GLImageEGL::ScheduleOverlayPlane(gfx::AcceleratedWidget widget, |
int z_order, |
- OverlayTransform transform, |
- const Rect& bounds_rect, |
- const RectF& crop_rect) { |
+ gfx::OverlayTransform transform, |
+ const gfx::Rect& bounds_rect, |
+ const gfx::RectF& crop_rect) { |
return false; |
} |
-} // namespace gfx |
+} // namespace gl |