Fixed guestview sizing bug that resulted in incorrect <webview> sizing on the signin page.

extensions/browser/guest_view/guest_view_base.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 "extensions/browser/guest_view/guest_view_base.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/ui/zoom/page_zoom.h"
 #include "components/ui/zoom/zoom_controller.h"
@@ skipping 699 matching lines @@
     // The derived class did not create a WebContents so this class serves no
     // purpose. Let's self-destruct.
     delete this;
     callback.Run(nullptr);
     return;
   }
   InitWithWebContents(*create_params, guest_web_contents);
   callback.Run(guest_web_contents);
 }
 
+double GuestViewBase::GetEmbedderZoomFactor() {
+  if (!embedder_web_contents())
+    return 1.0;
+
+  auto zoom_controller =
+      ui_zoom::ZoomController::FromWebContents(embedder_web_contents());
+  if (!zoom_controller)
+    return 1.0;
+
+  double zoom_factor =
+      content::ZoomLevelToZoomFactor(zoom_controller->GetZoomLevel());
+  return zoom_factor;
+}
+
+int GuestViewBase::LogicalPixelsToPhysicalPixels(double logical_pixels) {
+  DCHECK(logical_pixels >= 0);
+  double zoom_factor = GetEmbedderZoomFactor();
+  return static_cast<int>(logical_pixels * zoom_factor + 0.5);
+}
+
+double GuestViewBase::PhysicalPixelsToLogicalPixels(int physical_pixels) {
+  DCHECK(physical_pixels >= 0);
+  double zoom_factor = GetEmbedderZoomFactor();
+  return physical_pixels * zoom_factor;
+}
+
 void GuestViewBase::SetUpSizing(const base::DictionaryValue& params) {
   // Read the autosize parameters passed in from the embedder.
   bool auto_size_enabled = false;
   params.GetBoolean(guestview::kAttributeAutoSize, &auto_size_enabled);
 
   int max_height = 0;
   int max_width = 0;
   params.GetInteger(guestview::kAttributeMaxHeight, &max_height);
   params.GetInteger(guestview::kAttributeMaxWidth, &max_width);
 
   int min_height = 0;
   int min_width = 0;
   params.GetInteger(guestview::kAttributeMinHeight, &min_height);
   params.GetInteger(guestview::kAttributeMinWidth, &min_width);
 
   // Set the normal size to the element size so that the guestview will fit the
   // element initially if autosize is disabled.
-  int normal_height = 0;
-  int normal_width = 0;
-  params.GetInteger(guestview::kElementHeight, &normal_height);
-  params.GetInteger(guestview::kElementWidth, &normal_width);
+  double element_height = 0.0;
+  double element_width = 0.0;
+  params.GetDouble(guestview::kElementHeight, &element_height);
+  params.GetDouble(guestview::kElementWidth, &element_width);
+  // Convert the element size from logical pixels to physical pixels.
+  int normal_height = LogicalPixelsToPhysicalPixels(element_height);
+  int normal_width = LogicalPixelsToPhysicalPixels(element_width);
 
   SetSizeParams set_size_params;
   set_size_params.enable_auto_size.reset(new bool(auto_size_enabled));
   set_size_params.min_size.reset(new gfx::Size(min_width, min_height));
   set_size_params.max_size.reset(new gfx::Size(max_width, max_height));
   set_size_params.normal_size.reset(new gfx::Size(normal_width, normal_height));
 
   // Call SetSize to apply all the appropriate validation and clipping of
   // values.
   SetSize(set_size_params);
@@ skipping 31 matching lines @@
 void GuestViewBase::RegisterGuestViewTypes() {
   AppViewGuest::Register();
   ExtensionOptionsGuest::Register();
   ExtensionViewGuest::Register();
   MimeHandlerViewGuest::Register();
   SurfaceWorkerGuest::Register();
   WebViewGuest::Register();
 }
 
 }  // namespace extensions