Mandoline: Fix OOPIF high DPI sizing.

components/view_manager/connection_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/connection_manager.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/quads/shared_quad_state.h"
 #include "components/view_manager/client_connection.h"
 #include "components/view_manager/connection_manager_delegate.h"
 #include "components/view_manager/focus_controller.h"
 #include "components/view_manager/server_view.h"
 #include "components/view_manager/view_coordinate_conversions.h"
 #include "components/view_manager/view_tree_host_connection.h"
 #include "components/view_manager/view_tree_impl.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
+#include "ui/gfx/geometry/size_conversions.h"
 
 using mojo::ConnectionSpecificId;
 
 namespace view_manager {
 namespace {
 
 // Creates a copy of |view|. The copied view has |delegate| as its delegate.
 // This does not recurse.
 ServerView* CloneView(const ServerView* view, ServerViewDelegate* delegate) {
   ServerView* clone = new ServerView(delegate, ClonedViewId());
@@ skipping 690 matching lines @@
 
   ViewTreeHostImpl* new_host =
       new_focused_view ? GetViewTreeHostByView(new_focused_view) : nullptr;
 
   if (new_host)
     new_host->UpdateTextInputState(new_focused_view->text_input_state());
   else if (old_host)
     old_host->UpdateTextInputState(ui::TextInputState());
 }
 
-bool ConnectionManager::ConvertSurfaceDrawQuad(const mojo::QuadPtr& input,
-                                               cc::SharedQuadState* sqs,
-                                               cc::RenderPass* render_pass) {
+bool ConnectionManager::ConvertSurfaceDrawQuad(
+    const mojo::QuadPtr& input,
+    const mojo::CompositorFrameMetadataPtr& metadata,
+    cc::SharedQuadState* sqs,
+    cc::RenderPass* render_pass) {
   unsigned int id = static_cast<unsigned int>(
       input->surface_quad_state->surface.To<cc::SurfaceId>().id);
-  // TODO(fsamuel): Security check.
+  // TODO(fsamuel): Security checks:
+  // 1. We need to make sure the embedder can only position views it's allowed
+  //    to access.
+  // 2. We need to make sure that the embedder cannot place views in areas
+  //    outside of its own bounds.
   ServerView* view = GetView(ViewIdFromTransportId(id));
   // If a CompositorFrame message arrives late, say during a navigation, then
   // it may contain view IDs that no longer exist.
   if (!view)
     return false;
   gfx::Rect bounds(input->visible_rect.To<gfx::Rect>());
   gfx::Point p;
   sqs->quad_to_target_transform.TransformPoint(&p);
   bounds.set_origin(p);
+  // TODO(fsamuel): This seems like a crude way to set the size that probably
+  // doesn't work correctly in the general case. We need to get transforms
+  // working correctly in the general case.
+  bounds.set_size(gfx::ToRoundedSize(
+      gfx::ScaleSize(bounds.size(), metadata->device_scale_factor)));
   view->SetBounds(bounds);
   return true;
 }
 
 }  // namespace view_manager