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

cc/blimp/compositor_state_deserializer.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/blimp/compositor_state_deserializer.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "cc/blimp/client_picture_cache.h"
 #include "cc/blimp/compositor_state_deserializer_client.h"
@@ skipping 159 matching lines @@
       GetLayer(layer_tree_proto.inner_viewport_scroll_layer_id()),
       GetLayer(layer_tree_proto.outer_viewport_scroll_layer_id()));
 
   layer_tree->SetDeviceScaleFactor(layer_tree_proto.device_scale_factor());
   layer_tree->SetPaintedDeviceScaleFactor(
       layer_tree_proto.painted_device_scale_factor());
 
   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(
       layer_tree_proto.has_transparent_background());
 
   LayerSelection selection;
   LayerSelectionFromProtobuf(&selection, layer_tree_proto.selection());
   layer_tree->RegisterSelection(selection);
   layer_tree->SetViewportSize(
       ProtoToSize(layer_tree_proto.device_viewport_size()));
@@ skipping 243 matching lines @@
 DeserializedContentLayerClient*
 CompositorStateDeserializer::GetContentLayerClient(int engine_layer_id) const {
   EngineIdToLayerMap::const_iterator layer_it =
       engine_id_to_layer_.find(engine_layer_id);
   return layer_it != engine_id_to_layer_.end()
              ? layer_it->second.content_layer_client.get()
              : nullptr;
 }
 
 }  // namespace cc