Change mojo geometry structs from using type converters to StructTraits.

components/mus/gles2/command_buffer_driver.cc

 // Copyright 2013 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 "components/mus/gles2/command_buffer_driver.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/shared_memory.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "components/mus/gles2/gl_surface_adapter.h"
 #include "components/mus/gles2/gpu_memory_tracker.h"
 #include "components/mus/gles2/gpu_state.h"
 #include "components/mus/gles2/mojo_buffer_backing.h"
 #include "gpu/command_buffer/common/gpu_memory_buffer_support.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/command_executor.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/image_manager.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/query_manager.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 #include "ui/gfx/buffer_format_util.h"
-#include "ui/gfx/geometry/mojo/geometry_type_converters.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_image_shared_memory.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/init/gl_factory.h"
 
 #if defined(USE_OZONE)
 #include "ui/gl/gl_image_ozone_native_pixmap.h"
 #endif
@@ skipping 170 matching lines @@
 }
 
 void CommandBufferDriver::DestroyTransferBuffer(int32_t id) {
   DCHECK(CalledOnValidThread());
   command_buffer_->DestroyTransferBuffer(id);
 }
 
 void CommandBufferDriver::CreateImage(int32_t id,
                                       mojo::ScopedHandle memory_handle,
                                       int32_t type,
-                                      mojo::SizePtr size,
+                                      const gfx::Size& size,
                                       int32_t format,
                                       int32_t internal_format) {
   DCHECK(CalledOnValidThread());
   if (!MakeCurrent())
     return;
 
   gpu::gles2::ImageManager* image_manager = decoder_->GetImageManager();
   if (image_manager->LookupImage(id)) {
     LOG(ERROR) << "Image already exists with same ID.";
     return;
   }
 
   gfx::BufferFormat gpu_format = static_cast<gfx::BufferFormat>(format);
   if (!gpu::IsGpuMemoryBufferFormatSupported(gpu_format,
                                              decoder_->GetCapabilities())) {
     LOG(ERROR) << "Format is not supported.";
     return;
   }
 
-  gfx::Size gfx_size = size.To<gfx::Size>();
-  if (!gpu::IsImageSizeValidForGpuMemoryBufferFormat(gfx_size, gpu_format)) {
+  if (!gpu::IsImageSizeValidForGpuMemoryBufferFormat(size, gpu_format)) {
     LOG(ERROR) << "Invalid image size for format.";
     return;
   }
 
   if (!gpu::IsImageFormatCompatibleWithGpuMemoryBufferFormat(internal_format,
                                                              gpu_format)) {
     LOG(ERROR) << "Incompatible image format.";
     return;
   }
 
@@ skipping 10 matching lines @@
     return;
   }
 
 #if defined(OS_WIN)
   base::SharedMemoryHandle handle(platform_file, base::GetCurrentProcId());
 #else
   base::FileDescriptor handle(platform_file, false);
 #endif
 
   scoped_refptr<gl::GLImageSharedMemory> image =
-      new gl::GLImageSharedMemory(gfx_size, internal_format);
+      new gl::GLImageSharedMemory(size, internal_format);
   // TODO(jam): also need a mojo enum for this enum
   if (!image->Initialize(
           handle, gfx::GpuMemoryBufferId(id), gpu_format, 0,
-          gfx::RowSizeForBufferFormat(gfx_size.width(), gpu_format, 0))) {
+          gfx::RowSizeForBufferFormat(size.width(), gpu_format, 0))) {
     NOTREACHED();
     return;
   }
 
   image_manager->AddImage(image.get(), id);
 }
 
 // TODO(rjkroege): It is conceivable that this code belongs in
 // ozone_gpu_memory_buffer.cc
 void CommandBufferDriver::CreateImageNativeOzone(int32_t id,
@@ skipping 253 matching lines @@
 }
 
 void CommandBufferDriver::OnGpuCompletedSwapBuffers(gfx::SwapResult result) {
   DCHECK(CalledOnValidThread());
   if (client_) {
     client_->OnGpuCompletedSwapBuffers(result);
   }
 }
 
 }  // namespace mus