cc/blimp: Add synchronization for scroll/scale state.

cc/trees/layer_tree_host_in_process.cc

 // Copyright 2011 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_host_in_process.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 432 matching lines @@
   if (next_commit_forces_recalculate_raster_scales_) {
     sync_tree->ForceRecalculateRasterScales();
     next_commit_forces_recalculate_raster_scales_ = false;
   }
 
   sync_tree->set_source_frame_number(SourceFrameNumber());
 
   if (layer_tree_->needs_full_tree_sync())
     TreeSynchronizer::SynchronizeTrees(layer_tree_->root_layer(), sync_tree);
 
-  layer_tree_->PushPropertiesTo(sync_tree);
+  float page_scale_delta = 1.f;
+  if (reflected_main_frame_state_)
+    page_scale_delta = reflected_main_frame_state_->page_scale_delta;
+  layer_tree_->PushPropertiesTo(sync_tree, page_scale_delta);
 
   sync_tree->PassSwapPromises(swap_promise_manager_.TakeSwapPromises());
 
   host_impl->SetHasGpuRasterizationTrigger(has_gpu_rasterization_trigger_);
   host_impl->SetContentIsSuitableForGpuRasterization(
       content_is_suitable_for_gpu_rasterization_);
   RecordGpuRasterizationHistogram();
 
   host_impl->SetViewportSize(layer_tree_->device_viewport_size());
   sync_tree->SetDeviceScaleFactor(layer_tree_->device_scale_factor());
   host_impl->SetDebugState(debug_state_);
 
   sync_tree->set_ui_resource_request_queue(
       ui_resource_manager_->TakeUIResourcesRequests());
 
   {
     TRACE_EVENT0("cc", "LayerTreeHostInProcess::PushProperties");
 
     TreeSynchronizer::PushLayerProperties(layer_tree_.get(), sync_tree);
 
+    if (reflected_main_frame_state_) {
+      for (const auto& scroll_update : reflected_main_frame_state_->scrolls) {
+        int layer_id = scroll_update.layer_id;
+        gfx::Vector2dF scroll_delta = scroll_update.scroll_delta;
+
+        PropertyTrees* property_trees = layer_tree_->property_trees();
+        property_trees->scroll_tree.SetScrollOffset(
+            layer_id, gfx::ScrollOffsetWithDelta(
+                          layer_tree_->LayerById(layer_id)->scroll_offset(),
+                          scroll_delta));
+      }
+    }
+
     // This must happen after synchronizing property trees and after pushing
     // properties, which updates the clobber_active_value flag.
     sync_tree->UpdatePropertyTreeScrollOffset(layer_tree_->property_trees());
 
     // This must happen after synchronizing property trees and after push
     // properties, which updates property tree indices, but before animation
     // host pushes properties as animation host push properties can change
     // Animation::InEffect and we want the old InEffect value for updating
     // property tree scrolling and animation.
     sync_tree->UpdatePropertyTreeScrollingAndAnimationFromMainThread();
 
     TRACE_EVENT0("cc", "LayerTreeHostInProcess::AnimationHost::PushProperties");
     DCHECK(host_impl->mutator_host());
     layer_tree_->animation_host()->PushPropertiesTo(host_impl->mutator_host());
   }
 
   micro_benchmark_controller_.ScheduleImplBenchmarks(host_impl);
   layer_tree_->property_trees()->ResetAllChangeTracking();
+  reflected_main_frame_state_ = nullptr;
 }
 
 void LayerTreeHostInProcess::WillCommit() {
   swap_promise_manager_.WillCommit();
   client_->WillCommit();
 }
 
 void LayerTreeHostInProcess::UpdateHudLayer() {}
 
 void LayerTreeHostInProcess::CommitComplete() {
@@ skipping 372 matching lines @@
       layer->SetScrollbarsHiddenFromImplSide(info->scrollbars[i].hidden);
     }
   }
 
   // This needs to happen after scroll deltas have been sent to prevent top
   // controls from clamping the layout viewport both on the compositor and
   // on the main thread.
   ApplyViewportDeltas(info);
 }
 
+void LayerTreeHostInProcess::SetReflectedMainFrameState(
+    std::unique_ptr<ReflectedMainFrameState> reflected_main_frame_state) {
+  DCHECK(IsThreaded());
+
+  reflected_main_frame_state_ = std::move(reflected_main_frame_state);
+  SetNeedsCommit();
+}
+
 const base::WeakPtr<InputHandler>& LayerTreeHostInProcess::GetInputHandler()
     const {
   return input_handler_weak_ptr_;
 }
 
 void LayerTreeHostInProcess::UpdateBrowserControlsState(
     BrowserControlsState constraints,
     BrowserControlsState current,
     bool animate) {
   // Browser controls are only used in threaded or remote mode.
@@ skipping 134 matching lines @@
 
   debug_state_.FromProtobuf(proto.debug_state());
   has_gpu_rasterization_trigger_ = proto.has_gpu_rasterization_trigger();
   content_is_suitable_for_gpu_rasterization_ =
       proto.content_is_suitable_for_gpu_rasterization();
   id_ = proto.id();
   next_commit_forces_redraw_ = proto.next_commit_forces_redraw();
 }
 
 }  // namespace cc