Index: cc/trees/layer_tree_impl.cc |
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc |
index 47c4ee003382c99d34786c6441bfd0deeabbe4fb..4eddc15ab175716d34de0eb6f00dd02a75c407de 100644 |
--- a/cc/trees/layer_tree_impl.cc |
+++ b/cc/trees/layer_tree_impl.cc |
@@ -58,6 +58,7 @@ LayerTreeImpl::LayerTreeImpl( |
min_page_scale_factor_(0), |
max_page_scale_factor_(0), |
device_scale_factor_(1.f), |
+ painted_device_scale_factor_(0.f), |
aelias_OOO_until_Jul13
2015/10/25 00:07:11
This one should default to 1 as well.
oshima
2015/10/27 20:28:09
Done.
|
elastic_overscroll_(elastic_overscroll), |
viewport_size_invalid_(false), |
needs_update_draw_properties_(true), |
@@ -315,6 +316,7 @@ void LayerTreeImpl::PushPropertiesTo(LayerTreeImpl* target_tree) { |
target_tree->PushPageScaleFactorAndLimits(nullptr, min_page_scale_factor(), |
max_page_scale_factor()); |
target_tree->SetDeviceScaleFactor(device_scale_factor()); |
+ target_tree->set_painted_device_scale_factor(painted_device_scale_factor()); |
target_tree->elastic_overscroll()->PushPendingToActive(); |
target_tree->pending_page_scale_animation_ = |