Break //ui/gl/ dependency on //ui/ozone.

ui/ozone/gl/gl_image_ozone_native_pixmap.cc

-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "ui/ozone/gl/gl_image_ozone_native_pixmap.h"
+
+#include <vector>
+
 #include "ui/gfx/buffer_format_util.h"
-#include "ui/gl/gl_image_ozone_native_pixmap.h"
 #include "ui/gl/gl_surface_egl.h"
 
 #define FOURCC(a, b, c, d)                                        \
   ((static_cast<uint32_t>(a)) | (static_cast<uint32_t>(b) << 8) | \
    (static_cast<uint32_t>(c) << 16) | (static_cast<uint32_t>(d) << 24))
 
 #define DRM_FORMAT_R8 FOURCC('R', '8', ' ', ' ')
 #define DRM_FORMAT_RGB565 FOURCC('R', 'G', '1', '6')
 #define DRM_FORMAT_ARGB8888 FOURCC('A', 'R', '2', '4')
 #define DRM_FORMAT_ABGR8888 FOURCC('A', 'B', '2', '4')
 #define DRM_FORMAT_XRGB8888 FOURCC('X', 'R', '2', '4')
 #define DRM_FORMAT_XBGR8888 FOURCC('X', 'B', '2', '4')
 #define DRM_FORMAT_YV12 FOURCC('Y', 'V', '1', '2')
 
-namespace gl {
+namespace ui {
 namespace {
 
 bool ValidInternalFormat(unsigned internalformat, gfx::BufferFormat format) {
   switch (internalformat) {
     case GL_RGB:
       return format == gfx::BufferFormat::BGR_565 ||
              format == gfx::BufferFormat::RGBX_8888 ||
              format == gfx::BufferFormat::BGRX_8888;
     case GL_RGB_YCRCB_420_CHROMIUM:
       return format == gfx::BufferFormat::YVU_420;
@@ skipping 65 matching lines @@
   return 0;
 }
 
 }  // namespace
 
 GLImageOzoneNativePixmap::GLImageOzoneNativePixmap(const gfx::Size& size,
                                                    unsigned internalformat)
     : GLImageEGL(size),
       internalformat_(internalformat),
       has_image_flush_external_(
-          GLSurfaceEGL::HasEGLExtension("EGL_EXT_image_flush_external")) {}
+          gl::GLSurfaceEGL::HasEGLExtension("EGL_EXT_image_flush_external")) {}
 
-GLImageOzoneNativePixmap::~GLImageOzoneNativePixmap() {
-}
+GLImageOzoneNativePixmap::~GLImageOzoneNativePixmap() {}
 
-bool GLImageOzoneNativePixmap::Initialize(ui::NativePixmap* pixmap,
+bool GLImageOzoneNativePixmap::Initialize(NativePixmap* pixmap,
                                           gfx::BufferFormat format) {
   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)) {
       return false;
     }
   } else if (pixmap->AreDmaBufFdsValid()) {
-
     if (!ValidFormat(format)) {
       LOG(ERROR) << "Invalid format: " << static_cast<int>(format);
       return false;
     }
 
     if (!ValidInternalFormat(internalformat_, format)) {
       LOG(ERROR) << "Invalid internalformat: " << internalformat_
                  << " for format: " << static_cast<int>(format);
       return false;
     }
 
     // Note: If eglCreateImageKHR is successful for a EGL_LINUX_DMA_BUF_EXT
     // target, the EGL will take a reference to the dma_buf.
     std::vector<EGLint> attrs;
     attrs.push_back(EGL_WIDTH);
     attrs.push_back(size_.width());
     attrs.push_back(EGL_HEIGHT);
     attrs.push_back(size_.height());
     attrs.push_back(EGL_LINUX_DRM_FOURCC_EXT);
     attrs.push_back(FourCC(format));
 
     const EGLint kLinuxDrmModifiers[] = {EGL_LINUX_DRM_PLANE0_MODIFIER0_EXT,
                                          EGL_LINUX_DRM_PLANE1_MODIFIER0_EXT,
                                          EGL_LINUX_DRM_PLANE2_MODIFIER0_EXT};
-    bool has_dma_buf_import_modifier =
-        GLSurfaceEGL::HasEGLExtension("EGL_EXT_image_dma_buf_import_modifiers");
+    bool has_dma_buf_import_modifier = gl::GLSurfaceEGL::HasEGLExtension(
+        "EGL_EXT_image_dma_buf_import_modifiers");
 
     for (size_t plane = 0;
          plane < gfx::NumberOfPlanesForBufferFormat(pixmap->GetBufferFormat());
          ++plane) {
       attrs.push_back(EGL_DMA_BUF_PLANE0_FD_EXT + plane * 3);
       attrs.push_back(
           pixmap->GetDmaBufFd(plane < pixmap->GetDmaBufFdCount() ? plane : 0));
       attrs.push_back(EGL_DMA_BUF_PLANE0_OFFSET_EXT + plane * 3);
       attrs.push_back(pixmap->GetDmaBufOffset(plane));
       attrs.push_back(EGL_DMA_BUF_PLANE0_PITCH_EXT + plane * 3);
@@ skipping 26 matching lines @@
 
 void GLImageOzoneNativePixmap::Destroy(bool have_context) {
   GLImageEGL::Destroy(have_context);
 }
 
 bool GLImageOzoneNativePixmap::CopyTexImage(unsigned target) {
   if (egl_image_ == EGL_NO_IMAGE_KHR) {
     // Pass-through image type fails to bind and copy; make sure we
     // don't draw with uninitialized texture.
     std::vector<unsigned char> data(size_.width() * size_.height() * 4);
-    glTexImage2D(target, 0, GL_RGBA, size_.width(),
-                 size_.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE,
-                 data.data());
+    glTexImage2D(target, 0, GL_RGBA, size_.width(), size_.height(), 0, GL_RGBA,
+                 GL_UNSIGNED_BYTE, data.data());
     return true;
   }
   return GLImageEGL::CopyTexImage(target);
 }
 
 bool GLImageOzoneNativePixmap::ScheduleOverlayPlane(
     gfx::AcceleratedWidget widget,
     int z_order,
     gfx::OverlayTransform transform,
     const gfx::Rect& bounds_rect,
     const gfx::RectF& crop_rect) {
   DCHECK(pixmap_);
   return pixmap_->ScheduleOverlayPlane(widget, z_order, transform, bounds_rect,
                                        crop_rect);
 }
 
 void GLImageOzoneNativePixmap::Flush() {
   if (!has_image_flush_external_)
     return;
 
-  EGLDisplay display = GLSurfaceEGL::GetHardwareDisplay();
+  EGLDisplay display = gl::GLSurfaceEGL::GetHardwareDisplay();
   const EGLAttrib attribs[] = {
       EGL_NONE,
   };
   if (!eglImageFlushExternalEXT(display, egl_image_, attribs)) {
     LOG(ERROR) << "Failed to flush rendering";
     return;
   }
 }
 
 void GLImageOzoneNativePixmap::OnMemoryDump(
@@ skipping 28 matching lines @@
     case gfx::BufferFormat::YUV_420_BIPLANAR:
     case gfx::BufferFormat::UYVY_422:
       NOTREACHED();
       return GL_NONE;
   }
 
   NOTREACHED();
   return GL_NONE;
 }
 
-}  // namespace gl
+}  // namespace ui