Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Unified Diff: extensions/browser/guest_view/guest_view_base.cc

Issue 939443002: Fixed guestview sizing bug that resulted in incorrect <webview> sizing on the signin page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/browser/guest_view/guest_view_base.cc
diff --git a/extensions/browser/guest_view/guest_view_base.cc b/extensions/browser/guest_view/guest_view_base.cc
index 14754dce45061e29c950a710d3b064344a3ce6ff..0f81f272927e0cd4de15f7291fd2666ff8ae6c1d 100644
--- a/extensions/browser/guest_view/guest_view_base.cc
+++ b/extensions/browser/guest_view/guest_view_base.cc
@@ -717,6 +717,32 @@ void GuestViewBase::CompleteInit(
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;
@@ -734,10 +760,13 @@ void GuestViewBase::SetUpSizing(const base::DictionaryValue& params) {
// 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));
« no previous file with comments | « extensions/browser/guest_view/guest_view_base.h ('k') | extensions/renderer/resources/guest_view/guest_view_container.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698