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

Unified Diff: ui/gl/gl_image_ozone_native_pixmap.cc

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_ozone_native_pixmap.cc
diff --git a/ui/gl/gl_image_ozone_native_pixmap.cc b/ui/gl/gl_image_ozone_native_pixmap.cc
index ab44d19d60cd1e43643a978674667dc1fb9e64ae..818426178aea6fa8af3f49e92d0251fed0f445fc 100644
--- a/ui/gl/gl_image_ozone_native_pixmap.cc
+++ b/ui/gl/gl_image_ozone_native_pixmap.cc
@@ -81,7 +81,7 @@ EGLint FourCC(BufferFormat format) {
GLImageOzoneNativePixmap::GLImageOzoneNativePixmap(const Size& size,
unsigned internalformat)
- : GLImageEGL(size), internalformat_(internalformat) {}
+ : gl::GLImageEGL(size), internalformat_(internalformat) {}
GLImageOzoneNativePixmap::~GLImageOzoneNativePixmap() {
}
@@ -91,8 +91,8 @@ bool GLImageOzoneNativePixmap::Initialize(ui::NativePixmap* pixmap,
DCHECK(!pixmap_);
if (pixmap->GetEGLClientBuffer()) {
EGLint attrs[] = {EGL_IMAGE_PRESERVED_KHR, EGL_TRUE, EGL_NONE};
- if (!GLImageEGL::Initialize(EGL_NATIVE_PIXMAP_KHR,
- pixmap->GetEGLClientBuffer(), attrs)) {
+ if (!gl::GLImageEGL::Initialize(EGL_NATIVE_PIXMAP_KHR,
+ pixmap->GetEGLClientBuffer(), attrs)) {
return false;
}
} else if (pixmap->GetDmaBufFd() >= 0) {
@@ -121,8 +121,9 @@ bool GLImageOzoneNativePixmap::Initialize(ui::NativePixmap* pixmap,
EGL_DMA_BUF_PLANE0_PITCH_EXT,
pixmap->GetDmaBufPitch(),
EGL_NONE};
- if (!GLImageEGL::Initialize(EGL_LINUX_DMA_BUF_EXT,
- static_cast<EGLClientBuffer>(nullptr), attrs)) {
+ if (!gl::GLImageEGL::Initialize(EGL_LINUX_DMA_BUF_EXT,
+ static_cast<EGLClientBuffer>(nullptr),
+ attrs)) {
return false;
}
}
@@ -136,7 +137,7 @@ unsigned GLImageOzoneNativePixmap::GetInternalFormat() {
}
void GLImageOzoneNativePixmap::Destroy(bool have_context) {
- GLImageEGL::Destroy(have_context);
+ gl::GLImageEGL::Destroy(have_context);
}
bool GLImageOzoneNativePixmap::ScheduleOverlayPlane(AcceleratedWidget widget,

Powered by Google App Engine
This is Rietveld 408576698