ozone: Introduce ClientPixmap and ClientPixmapFactory for non-GPU processes.

content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc

 // Copyright 2014 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 "content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h"
 
 #include "base/logging.h"
 #include "ui/gl/gl_image.h"
-#include "ui/ozone/public/surface_factory_ozone.h"
+#include "ui/ozone/public/native_pixmap_client.h"
 
 namespace content {
 namespace {
 
-const GpuMemoryBufferFactory::Configuration kSupportedConfigurations[] = {
-  { gfx::GpuMemoryBuffer::BGRA_8888, gfx::GpuMemoryBuffer::SCANOUT },
-  { gfx::GpuMemoryBuffer::RGBX_8888, gfx::GpuMemoryBuffer::SCANOUT }
-};
+gfx::GpuMemoryBuffer::Format ConvertFormat(

[reveman, 2015/06/05 20:26:06]

nit: the name ConvertFormat is a bit ambiguous. maybe
FormatFromOzoneBufferFormat instead

[dshwang, 2015/06/08 11:15:14]

Done.

+    ui::SurfaceFactoryOzone::BufferFormat ozone_format) {
+  switch (ozone_format) {
+    case ui::SurfaceFactoryOzone::BGRA_8888:
+      return gfx::GpuMemoryBuffer::BGRA_8888;
+    case ui::SurfaceFactoryOzone::RGBX_8888:
+      return gfx::GpuMemoryBuffer::RGBX_8888;
+    default:

[reveman, 2015/06/05 20:26:07]

nit: avoid a default case if possible

[dshwang, 2015/06/08 11:15:14]

Done.

+      NOTREACHED();
+  }
+  NOTREACHED();
+  return gfx::GpuMemoryBuffer::BGRA_8888;
+}
+
+gfx::GpuMemoryBuffer::Usage ConvertUsage(

[reveman, 2015/06/05 20:26:06]

nit: maybe UsageFromOzoneBufferUsage

[dshwang, 2015/06/08 11:15:14]

Done.

+    ui::SurfaceFactoryOzone::BufferUsage ozone_usage) {
+  switch (ozone_usage) {
+    case ui::SurfaceFactoryOzone::MAP:
+      return gfx::GpuMemoryBuffer::MAP;
+    case ui::SurfaceFactoryOzone::PERSISTENT_MAP:
+      return gfx::GpuMemoryBuffer::PERSISTENT_MAP;
+    case ui::SurfaceFactoryOzone::SCANOUT:
+      return gfx::GpuMemoryBuffer::SCANOUT;
+  }
+  NOTREACHED();
+  return gfx::GpuMemoryBuffer::MAP;
+}
+
+void ConvertConfigurations(
+    const std::vector<ui::NativePixmapClient::Configuration>&
+        ozone_configurations,
+    std::vector<GpuMemoryBufferFactory::Configuration>* configurations) {
+  for (auto& ozone_conf : ozone_configurations) {
+    configurations->push_back(
+        {ConvertFormat(ozone_conf.format), ConvertUsage(ozone_conf.usage)});
+  }
+}
+
+void GetSupportedConfigurations(
+    std::vector<GpuMemoryBufferFactory::Configuration>* configurations) {
+  std::vector<ui::NativePixmapClient::Configuration> ozone_configurations =
+      ui::NativePixmapClient::GetInstance()
+          ->GetSupportedNativePixmapConfigurations();
+  ConvertConfigurations(ozone_configurations, configurations);
+}
 
 }  // namespace
 
 GpuMemoryBufferFactoryOzoneNativeBuffer::
     GpuMemoryBufferFactoryOzoneNativeBuffer() {
 }
 
 GpuMemoryBufferFactoryOzoneNativeBuffer::
     ~GpuMemoryBufferFactoryOzoneNativeBuffer() {
 }
 
 // static
 bool GpuMemoryBufferFactoryOzoneNativeBuffer::
     IsGpuMemoryBufferConfigurationSupported(gfx::GpuMemoryBuffer::Format format,
                                             gfx::GpuMemoryBuffer::Usage usage) {
-  for (auto& configuration : kSupportedConfigurations) {
+  std::vector<Configuration> configurations;
+  GetSupportedConfigurations(&configurations);
+  for (auto& configuration : configurations) {
     if (configuration.format == format && configuration.usage == usage)
       return true;
   }
 
   return false;
 }
 
 void GpuMemoryBufferFactoryOzoneNativeBuffer::
     GetSupportedGpuMemoryBufferConfigurations(
         std::vector<Configuration>* configurations) {
-  if (!ui::SurfaceFactoryOzone::GetInstance()->CanCreateNativePixmap(
-          ui::SurfaceFactoryOzone::SCANOUT))
-    return;
-
-  configurations->assign(
-      kSupportedConfigurations,
-      kSupportedConfigurations + arraysize(kSupportedConfigurations));
+  GetSupportedConfigurations(configurations);
 }
 
 gfx::GpuMemoryBufferHandle
 GpuMemoryBufferFactoryOzoneNativeBuffer::CreateGpuMemoryBuffer(
     gfx::GpuMemoryBufferId id,
     const gfx::Size& size,
     gfx::GpuMemoryBuffer::Format format,
     gfx::GpuMemoryBuffer::Usage usage,
     int client_id,
     gfx::PluginWindowHandle surface_handle) {
@@ skipping 23 matching lines @@
     const gfx::Size& size,
     gfx::GpuMemoryBuffer::Format format,
     unsigned internalformat,
     int client_id) {
   DCHECK_EQ(handle.type, gfx::OZONE_NATIVE_BUFFER);
   return ozone_native_buffer_factory_.CreateImageForGpuMemoryBuffer(
       handle.id, size, format, internalformat, client_id);
 }
 
 }  // namespace content