Fix html_viewer crash in cc when logging into gmail.

components/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 "components/view_manager/display_manager.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "components/view_manager/connection_manager.h"
 #include "components/view_manager/server_view.h"
 #include "components/view_manager/view_coordinate_conversions.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
+#include "mojo/converters/surfaces/surfaces_utils.h"
 #include "mojo/converters/transform/transform_type_converters.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
 #include "third_party/mojo_services/src/gpu/public/interfaces/gpu.mojom.h"
-#include "third_party/mojo_services/src/surfaces/public/cpp/surfaces_utils.h"
 #include "third_party/mojo_services/src/surfaces/public/interfaces/quads.mojom.h"
 #include "third_party/mojo_services/src/surfaces/public/interfaces/surfaces.mojom.h"
 
 using mojo::Rect;
 using mojo::Size;
 
 namespace view_manager {
 namespace {
 
 void DrawViewTree(mojo::Pass* pass,
@@ skipping 26 matching lines @@
   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->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 = mojo::CreateDefaultSQS(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 53 matching lines @@
 
 void DefaultDisplayManager::SetViewportSize(const gfx::Size& size) {
   native_viewport_->SetSize(Size::From(size));
 }
 
 const mojo::ViewportMetrics& DefaultDisplayManager::GetViewportMetrics() {
   return metrics_;
 }
 
 void DefaultDisplayManager::Draw() {
-  Rect rect;
-  rect.width = metrics_.size->width;
-  rect.height = metrics_.size->height;
-  auto pass = CreateDefaultPass(1, rect);
+  gfx::Rect rect(metrics_.size->width, metrics_.size->height);
+  auto pass = mojo::CreateDefaultPass(1, rect);
   pass->damage_rect = 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(),
@@ skipping 26 matching lines @@
       &DefaultDisplayManager::OnMetricsChanged, weak_factory_.GetWeakPtr()));
 }
 
 void DefaultDisplayManager::OnConnectionError() {
   // This is called when the native_viewport is torn down before
   // ~DefaultDisplayManager may be called.
   native_viewport_closed_callback_.Run();
 }
 
 }  // namespace view_manager