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

cc/trees/layer_tree.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/trees/layer_tree.h"
 
 #include "base/auto_reset.h"
 #include "base/time/time.h"
 #include "cc/animation/animation_host.h"
 #include "cc/input/page_scale_animation.h"
@@ skipping 32 matching lines @@
 }  // namespace
 
 LayerTree::Inputs::Inputs()
     : top_controls_height(0.f),
       top_controls_shown_ratio(0.f),
       browser_controls_shrink_blink_size(false),
       bottom_controls_height(0.f),
       device_scale_factor(1.f),
       painted_device_scale_factor(1.f),
       page_scale_factor(1.f),
+      subframe_page_scale_factor(1.f),
       min_page_scale_factor(1.f),
       max_page_scale_factor(1.f),
       background_color(SK_ColorWHITE),
       has_transparent_background(false),
       have_scroll_event_handlers(false),
       event_listener_properties() {}
 
 LayerTree::Inputs::~Inputs() = default;
 
 LayerTree::LayerTree(std::unique_ptr<AnimationHost> animation_host,
@@ skipping 129 matching lines @@
       inputs_.max_page_scale_factor == max_page_scale_factor)
     return;
 
   inputs_.page_scale_factor = page_scale_factor;
   inputs_.min_page_scale_factor = min_page_scale_factor;
   inputs_.max_page_scale_factor = max_page_scale_factor;
   SetPropertyTreesNeedRebuild();
   SetNeedsCommit();
 }
 
+void LayerTree::SetSubframePageScaleFactor(float subframe_page_scale_factor) {
+  if (inputs_.subframe_page_scale_factor == subframe_page_scale_factor)
+    return;
+
+  inputs_.subframe_page_scale_factor = subframe_page_scale_factor;
+  SetNeedsDisplayOnAllLayers();
+}
+
 void LayerTree::StartPageScaleAnimation(const gfx::Vector2d& target_offset,
                                         bool use_anchor,
                                         float scale,
                                         base::TimeDelta duration) {
   inputs_.pending_page_scale_animation.reset(new PendingPageScaleAnimation(
       target_offset, use_anchor, scale, duration));
 
   SetNeedsCommit();
 }
 
@@ skipping 181 matching lines @@
   if (inputs_.root_layer && property_trees_changed_on_active_tree) {
     if (property_trees_.sequence_number ==
         tree_impl->property_trees()->sequence_number)
       tree_impl->property_trees()->PushChangeTrackingTo(&property_trees_);
     else
       tree_impl->MoveChangeTrackingToLayers();
   }
   // Setting property trees must happen before pushing the page scale.
   tree_impl->SetPropertyTrees(&property_trees_);
 
-  tree_impl->PushPageScaleFromMainThread(inputs_.page_scale_factor,
-                                         inputs_.min_page_scale_factor,
-                                         inputs_.max_page_scale_factor);
+  tree_impl->PushPageScaleFromMainThread(
+      inputs_.page_scale_factor, inputs_.subframe_page_scale_factor,
+      inputs_.min_page_scale_factor, inputs_.max_page_scale_factor);
 
   tree_impl->set_browser_controls_shrink_blink_size(
       inputs_.browser_controls_shrink_blink_size);
   tree_impl->set_top_controls_height(inputs_.top_controls_height);
   tree_impl->set_bottom_controls_height(inputs_.bottom_controls_height);
   tree_impl->PushBrowserControlsFromMainThread(
       inputs_.top_controls_shown_ratio);
   tree_impl->elastic_overscroll()->PushFromMainThread(elastic_overscroll_);
   if (tree_impl->IsActiveTree())
     tree_impl->elastic_overscroll()->PushPendingToActive();
@@ skipping 39 matching lines @@
       inputs_.outer_viewport_scroll_layer
           ? inputs_.outer_viewport_scroll_layer->id()
           : Layer::INVALID_ID);
 
   // Browser Controls ignored. They are not supported.
   DCHECK(!inputs_.browser_controls_shrink_blink_size);
 
   proto->set_device_scale_factor(inputs_.device_scale_factor);
   proto->set_painted_device_scale_factor(inputs_.painted_device_scale_factor);
   proto->set_page_scale_factor(inputs_.page_scale_factor);
+  proto->set_subframe_page_scale_factor(inputs_.subframe_page_scale_factor);
   proto->set_min_page_scale_factor(inputs_.min_page_scale_factor);
   proto->set_max_page_scale_factor(inputs_.max_page_scale_factor);
 
   proto->set_background_color(inputs_.background_color);
   proto->set_has_transparent_background(inputs_.has_transparent_background);
 
   LayerSelectionToProtobuf(inputs_.selection, proto->mutable_selection());
   SizeToProto(inputs_.device_viewport_size,
               proto->mutable_device_viewport_size());
 
@@ skipping 51 matching lines @@
       UpdateAndGetLayer(inputs_.inner_viewport_scroll_layer.get(),
                         proto.inner_viewport_scroll_layer_id(), this);
   inputs_.outer_viewport_scroll_layer =
       UpdateAndGetLayer(inputs_.outer_viewport_scroll_layer.get(),
                         proto.outer_viewport_scroll_layer_id(), this);
 
   inputs_.device_viewport_size = ProtoToSize(proto.device_viewport_size());
   inputs_.device_scale_factor = proto.device_scale_factor();
   inputs_.painted_device_scale_factor = proto.painted_device_scale_factor();
   inputs_.page_scale_factor = proto.page_scale_factor();
+  inputs_.subframe_page_scale_factor = proto.subframe_page_scale_factor();
   inputs_.min_page_scale_factor = proto.min_page_scale_factor();
   inputs_.max_page_scale_factor = proto.max_page_scale_factor();
   inputs_.background_color = proto.background_color();
   inputs_.has_transparent_background = proto.has_transparent_background();
   inputs_.have_scroll_event_handlers = proto.have_scroll_event_handlers();
   inputs_.event_listener_properties[static_cast<size_t>(
       EventListenerClass::kMouseWheel)] =
       static_cast<EventListenerProperties>(
           proto.wheel_event_listener_properties());
   inputs_.event_listener_properties[static_cast<size_t>(
@@ skipping 146 matching lines @@
 LayerListReverseIterator<Layer> LayerTree::rend() {
   return LayerListReverseIterator<Layer>(nullptr);
 }
 
 void LayerTree::SetNeedsDisplayOnAllLayers() {
   for (auto* layer : *this)
     layer->SetNeedsDisplay();
 }
 
 }  // namespace cc