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

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

Issue 1033373003: GuestView: Lazily push attributes to the browser process on attach (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_sizing
Patch Set: Created 5 years, 9 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 cf518e4f73374932f55be3529b2dd4e671f29899..134b236177490dc471351708b68a6b718a23567a 100644
--- a/extensions/browser/guest_view/guest_view_base.cc
+++ b/extensions/browser/guest_view/guest_view_base.cc
@@ -784,22 +784,23 @@ double GuestViewBase::GetEmbedderZoomFactor() {
}
void GuestViewBase::SetUpSizing(const base::DictionaryValue& params) {
+ SetSizeParams set_size_params;
paulmeyer 2015/03/27 22:40:40 Why is set_size_params declared up here now?
Fady Samuel 2015/03/27 22:56:36 Done.
// Read the autosize parameters passed in from the embedder.
- bool auto_size_enabled = false;
+ bool auto_size_enabled = auto_size_enabled_;
params.GetBoolean(guestview::kAttributeAutoSize, &auto_size_enabled);
- int max_height = 0;
- int max_width = 0;
+ int max_height = max_auto_size_.height();
+ int max_width = max_auto_size_.width();
params.GetInteger(guestview::kAttributeMaxHeight, &max_height);
params.GetInteger(guestview::kAttributeMaxWidth, &max_width);
- int min_height = 0;
- int min_width = 0;
+ int min_height = min_auto_size_.height();
+ int min_width = min_auto_size_.width();
params.GetInteger(guestview::kAttributeMinHeight, &min_height);
params.GetInteger(guestview::kAttributeMinWidth, &min_width);
- int normal_height = 0;
- int normal_width = 0;
+ int normal_height = normal_size_.height();
+ int normal_width = normal_size_.width();
if (is_full_page_plugin()) {
// The initial size of a full page plugin should be set to fill the
// owner's visible viewport.
@@ -830,7 +831,6 @@ void GuestViewBase::SetUpSizing(const base::DictionaryValue& params) {
}
}
- 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));

Powered by Google App Engine
This is Rietveld 408576698