[Master/Overview CL] Make PageScaleFactor work for oopif subframe.

cc/blimp/compositor_state_deserializer.cc

Index: cc/blimp/compositor_state_deserializer.cc
diff --git a/cc/blimp/compositor_state_deserializer.cc b/cc/blimp/compositor_state_deserializer.cc
index f83d9ef15ca997101d35330a618b8d84716f2e85..02c3dca82c0d6e6a4b08d7e854f6828a33e2b418 100644
--- a/cc/blimp/compositor_state_deserializer.cc
+++ b/cc/blimp/compositor_state_deserializer.cc
@@ -177,10 +177,15 @@ void CompositorStateDeserializer::SychronizeLayerTreeState(
   float min_page_scale_factor = layer_tree_proto.min_page_scale_factor();
   float max_page_scale_factor = layer_tree_proto.max_page_scale_factor();
   float page_scale_factor = layer_tree_proto.page_scale_factor();
-  if (client_->ShouldRetainClientPageScale(page_scale_factor))
+  float subframe_page_scale_factor =
+      layer_tree_proto.subframe_page_scale_factor();
+  if (client_->ShouldRetainClientPageScale(page_scale_factor)) {
     page_scale_factor = layer_tree->page_scale_factor();
+    subframe_page_scale_factor = layer_tree->subframe_page_scale_factor();
+  }
   layer_tree->SetPageScaleFactorAndLimits(
       page_scale_factor, min_page_scale_factor, max_page_scale_factor);
+  layer_tree->SetSubframePageScaleFactor(subframe_page_scale_factor);
 
   layer_tree->set_background_color(layer_tree_proto.background_color());
   layer_tree->set_has_transparent_background(