Allow building mojo_shell and non-graphical apps/services on a Mac

services/view_manager/display_manager.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 "services/view_manager/display_manager.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
 #include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
 #include "mojo/services/surfaces/public/interfaces/quads.mojom.h"
 #include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
 #include "services/view_manager/connection_manager.h"
 #include "services/view_manager/server_view.h"
 #include "services/view_manager/view_coordinate_conversions.h"
 
-using mojo::Rect;

[viettrungluu, 2015/09/10 18:11:09]

Why?

-using mojo::Size;
-
 namespace view_manager {
 namespace {
 
 void DrawViewTree(mojo::Pass* pass,
                   const ServerView* view,
                   const gfx::Vector2d& parent_to_root_origin_offset,
                   float opacity) {
   if (!view->visible())
     return;
 
@@ skipping 12 matching lines @@
 
   auto surface_quad_state = mojo::SurfaceQuadState::New();
   surface_quad_state->surface = mojo::SurfaceId::From(node_id);
 
   gfx::Transform node_transform;
   node_transform.Translate(absolute_bounds.x(), absolute_bounds.y());
 
   const gfx::Rect bounds_at_origin(view->bounds().size());
   auto surface_quad = mojo::Quad::New();
   surface_quad->material = mojo::Material::MATERIAL_SURFACE_CONTENT;
-  surface_quad->rect = Rect::From(bounds_at_origin);
-  surface_quad->opaque_rect = Rect::From(bounds_at_origin);
-  surface_quad->visible_rect = Rect::From(bounds_at_origin);
+  surface_quad->rect = mojo::Rect::From(bounds_at_origin);
+  surface_quad->opaque_rect = mojo::Rect::From(bounds_at_origin);
+  surface_quad->visible_rect = mojo::Rect::From(bounds_at_origin);
   surface_quad->needs_blending = true;
   surface_quad->shared_quad_state_index =
       base::saturated_cast<int32_t>(pass->shared_quad_states.size());
   surface_quad->surface_quad_state = surface_quad_state.Pass();
 
-  auto sqs = CreateDefaultSQS(*Size::From(view->bounds().size()));
+  auto sqs = CreateDefaultSQS(*mojo::Size::From(view->bounds().size()));
   sqs->blend_mode = mojo::SK_XFERMODE_kSrcOver_Mode;
   sqs->opacity = combined_opacity;
   sqs->content_to_target_transform = mojo::Transform::From(node_transform);
 
   pass->quads.push_back(surface_quad.Pass());
   pass->shared_quad_states.push_back(sqs.Pass());
 }
 
 }  // namespace
 
@@ skipping 49 matching lines @@
     return;
   const gfx::Rect root_relative_rect =
       ConvertRectBetweenViews(view, connection_manager_->root(), bounds);
   if (root_relative_rect.IsEmpty())
     return;
   dirty_rect_.Union(root_relative_rect);
   WantToDraw();
 }
 
 void DefaultDisplayManager::SetViewportSize(const gfx::Size& size) {
-  native_viewport_->SetSize(Size::From(size));
+  native_viewport_->SetSize(mojo::Size::From(size));
 }
 
 const mojo::ViewportMetrics& DefaultDisplayManager::GetViewportMetrics() {
   return metrics_;
 }
 
 void DefaultDisplayManager::Draw() {
-  Rect rect;
+  mojo::Rect rect;
   rect.width = metrics_.size->width;
   rect.height = metrics_.size->height;
   auto pass = CreateDefaultPass(1, rect);
-  pass->damage_rect = Rect::From(dirty_rect_);
+  pass->damage_rect = mojo::Rect::From(dirty_rect_);
 
   DrawViewTree(pass.get(), connection_manager_->root(), gfx::Vector2d(), 1.0f);
 
   auto frame = mojo::Frame::New();
   frame->passes.push_back(pass.Pass());
   frame->resources.resize(0u);
   frame_pending_ = true;
   display_->SubmitFrame(
       frame.Pass(),
       base::Bind(&DefaultDisplayManager::DidDraw, base::Unretained(this)));
@@ skipping 19 matching lines @@
   metrics_.size = metrics->size.Clone();
   metrics_.device_pixel_ratio = metrics->device_pixel_ratio;
   gfx::Rect bounds(metrics_.size.To<gfx::Size>());
   connection_manager_->root()->SetBounds(bounds);
   connection_manager_->ProcessViewportMetricsChanged(metrics_, *metrics);
   native_viewport_->RequestMetrics(base::Bind(
       &DefaultDisplayManager::OnMetricsChanged, weak_factory_.GetWeakPtr()));
 }
 
 }  // namespace view_manager