Change mojo geometry structs from using type converters to StructTraits.

components/mus/ws/server_window_surface.cc

 // Copyright 2015 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/ws/server_window_surface.h"
 
 #include "cc/output/compositor_frame.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "components/mus/public/cpp/surfaces/surfaces_type_converters.h"
 #include "components/mus/surfaces/surfaces_state.h"
 #include "components/mus/ws/server_window.h"
 #include "components/mus/ws/server_window_delegate.h"
 #include "components/mus/ws/server_window_surface_manager.h"
-#include "ui/gfx/geometry/mojo/geometry_type_converters.h"
 
 namespace mus {
 namespace ws {
 namespace {
 
 void CallCallback(const mojo::Closure& callback, cc::SurfaceDrawStatus status) {
   callback.Run();
 }
 
 }  // namespace
@@ skipping 19 matching lines @@
 
   if (registered_surface_factory_client_) {
     cc::SurfaceManager* surface_manager = manager_->GetSurfaceManager();
     surface_manager->UnregisterSurfaceFactoryClient(manager_->id_namespace());
   }
 }
 
 void ServerWindowSurface::SubmitCompositorFrame(
     mojom::CompositorFramePtr frame,
     const SubmitCompositorFrameCallback& callback) {
-  gfx::Size frame_size = frame->passes[0]->output_rect.To<gfx::Rect>().size();
+  gfx::Size frame_size = frame->passes[0]->output_rect.size();
   if (!surface_id_.is_null()) {
     // If the size of the CompostiorFrame has changed then destroy the existing
     // Surface and create a new one of the appropriate size.
     if (frame_size != last_submitted_frame_size_) {
       // Rendering of the topmost frame happens in two phases. First the frame
       // is generated and submitted, and a later date it is actually drawn.
       // During the time the frame is generated and drawn we can't destroy the
       // surface, otherwise when drawn you get an empty surface. To deal with
       // this we schedule destruction via the delegate. The delegate will call
       // us back when we're not waiting on a frame to be drawn (which may be
@@ skipping 63 matching lines @@
       other_window->GetOrCreateSurfaceManager()->GetDefaultSurface();
   ServerWindowSurface* underlay_surface =
       other_window->GetOrCreateSurfaceManager()->GetUnderlaySurface();
 
   if (!default_surface && !underlay_surface)
     return true;
 
   cc::SurfaceDrawQuad* surface_quad =
       render_pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
   if (default_surface) {
-    surface_quad->SetAll(sqs, input->rect.To<gfx::Rect>(),
-                         input->opaque_rect.To<gfx::Rect>(),
-                         input->visible_rect.To<gfx::Rect>(),
-                         input->needs_blending, default_surface->id());
+    surface_quad->SetAll(sqs, input->rect, input->opaque_rect,
+                         input->visible_rect, input->needs_blending,
+                         default_surface->id());
   }
   if (underlay_surface) {
     cc::SurfaceDrawQuad* underlay_quad =
         render_pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
-    underlay_quad->SetAll(sqs, input->rect.To<gfx::Rect>(),
-                          input->opaque_rect.To<gfx::Rect>(),
-                          input->visible_rect.To<gfx::Rect>(),
-                          input->needs_blending, underlay_surface->id());
+    underlay_quad->SetAll(sqs, input->rect, input->opaque_rect,
+                          input->visible_rect, input->needs_blending,
+                          underlay_surface->id());
   }
   return true;
 }
 
 void ServerWindowSurface::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   if (!client_ || !base::MessageLoop::current())
     return;
   client_->ReturnResources(
       mojo::Array<mojom::ReturnedResourcePtr>::From(resources));
 }
 
 void ServerWindowSurface::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   // TODO(tansell): Implement this.
 }
 
 }  // namespace ws
 }  // namespace mus