Rename GLImageOzoneNativePixmap to GLImageNativePixmap and move it from ui/ozone/gl to ui/gl

ui/gl/gl_image_native_pixmap.cc

 // 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 "ui/gl/gl_image_native_pixmap.h"
 
 #include <vector>
 
 #include "ui/gfx/buffer_format_util.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))
 
@@ skipping 89 matching lines @@
       NOTREACHED();
       return 0;
   }
 
   NOTREACHED();
   return 0;
 }
 
 }  // namespace
 
-GLImageOzoneNativePixmap::GLImageOzoneNativePixmap(const gfx::Size& size,
-                                                   unsigned internalformat)
+GLImageNativePixmap::GLImageNativePixmap(const gfx::Size& size,
+                                         unsigned internalformat)
     : GLImageEGL(size),
       internalformat_(internalformat),
       has_image_flush_external_(
           gl::GLSurfaceEGL::HasEGLExtension("EGL_EXT_image_flush_external")) {}
 
-GLImageOzoneNativePixmap::~GLImageOzoneNativePixmap() {}
+GLImageNativePixmap::~GLImageNativePixmap() {}
 
-bool GLImageOzoneNativePixmap::Initialize(NativePixmap* pixmap,
-                                          gfx::BufferFormat format) {
+bool GLImageNativePixmap::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);
@@ skipping 51 matching lines @@
                                 static_cast<EGLClientBuffer>(nullptr),
                                 &attrs[0])) {
       return false;
     }
   }
 
   pixmap_ = pixmap;
   return true;
 }
 
-unsigned GLImageOzoneNativePixmap::GetInternalFormat() {
+unsigned GLImageNativePixmap::GetInternalFormat() {
   return internalformat_;
 }
 
-bool GLImageOzoneNativePixmap::CopyTexImage(unsigned target) {
+bool GLImageNativePixmap::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());
     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) {
+bool GLImageNativePixmap::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() {
+void GLImageNativePixmap::Flush() {
   if (!has_image_flush_external_)
     return;
 
   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(
+void GLImageNativePixmap::OnMemoryDump(
     base::trace_event::ProcessMemoryDump* pmd,
     uint64_t process_tracing_id,
     const std::string& dump_name) {
   // TODO(ericrk): Implement GLImage OnMemoryDump. crbug.com/514914
 }
 
 // static
-unsigned GLImageOzoneNativePixmap::GetInternalFormatForTesting(
+unsigned GLImageNativePixmap::GetInternalFormatForTesting(
     gfx::BufferFormat format) {
   DCHECK(ValidFormat(format));
   switch (format) {
     case gfx::BufferFormat::R_8:
       return GL_RED_EXT;
     case gfx::BufferFormat::RG_88:
       return GL_RG_EXT;
     case gfx::BufferFormat::BGR_565:
     case gfx::BufferFormat::RGBX_8888:
     case gfx::BufferFormat::BGRX_8888:
@@ skipping 15 matching lines @@
     case gfx::BufferFormat::UYVY_422:
       NOTREACHED();
       return GL_NONE;
   }
 
   NOTREACHED();
   return GL_NONE;
 }
 
 }  // namespace ui