Change mojo geometry structs from using type converters to StructTraits.

mojo/converters/surfaces/surfaces_utils.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 "mojo/converters/surfaces/surfaces_utils.h"
 
-#include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/transform/transform_type_converters.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/transform.h"
 
 using mus::mojom::Pass;
 using mus::mojom::PassPtr;
 using mus::mojom::RenderPassId;
 using mus::mojom::SharedQuadState;
 using mus::mojom::SharedQuadStatePtr;
 
 namespace mojo {
 
 SharedQuadStatePtr CreateDefaultSQS(const gfx::Size& size) {
   SharedQuadStatePtr sqs = SharedQuadState::New();
   sqs->quad_to_target_transform = Transform::From(gfx::Transform());
-  sqs->quad_layer_bounds = Size::From(size);
-  sqs->visible_quad_layer_rect = Rect::From(gfx::Rect(size));
-  sqs->clip_rect = Rect::From(gfx::Rect(size));
+  sqs->quad_layer_bounds = size;
+  sqs->visible_quad_layer_rect = gfx::Rect(size);
+  sqs->clip_rect = gfx::Rect(size);
   sqs->is_clipped = false;
   sqs->opacity = 1.f;
   sqs->blend_mode = mus::mojom::SkXfermode::kSrc_Mode;
   sqs->sorting_context_id = 0;
   return sqs;
 }
 
 PassPtr CreateDefaultPass(int id, const gfx::Rect& rect) {
   PassPtr pass = Pass::New();
   RenderPassId render_pass_id;
   render_pass_id.layer_id = 1;
   render_pass_id.index = id;
   pass->id = render_pass_id.Clone();
-  pass->output_rect = Rect::From(rect);
-  pass->damage_rect = Rect::From(rect);
+  pass->output_rect = rect;
+  pass->damage_rect = rect;
   pass->transform_to_root_target = Transform::From(gfx::Transform());
   pass->has_transparent_background = false;
   return pass;
 }
 
 }  // namespace mojo