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

Unified Diff: cc/layers/picture_layer_impl.cc

Issue 2417783005: [Master/Overview CL] Make PageScaleFactor work for oopif subframe.
Patch Set: Created 4 years, 2 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
« no previous file with comments | « cc/layers/layer_impl.cc ('k') | content/browser/renderer_host/render_widget_host_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/picture_layer_impl.cc
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index 4bb23b6d8da1610ed3efb702e757ec1efb30e1fb..9b94f43ded3e7abea003d1b22c0b281995b0a6bf 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -1249,9 +1249,10 @@ void PictureLayerImpl::UpdateIdealScales() {
float min_contents_scale = MinimumContentsScale();
DCHECK_GT(min_contents_scale, 0.f);
- ideal_page_scale_ = IsAffectedByPageScale()
- ? layer_tree_impl()->current_page_scale_factor()
- : 1.f;
+ ideal_page_scale_ =
+ (!layer_tree_impl()->PageScaleLayer() || IsAffectedByPageScale())
Ian Vollick 2016/10/14 19:40:30 So we take the current page scale factor if we don
+ ? layer_tree_impl()->current_page_scale_factor()
+ : 1.f;
ideal_device_scale_ = layer_tree_impl()->device_scale_factor();
ideal_contents_scale_ =
std::min(kMaxIdealContentsScale,
« no previous file with comments | « cc/layers/layer_impl.cc ('k') | content/browser/renderer_host/render_widget_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698