cc/blimp: Set up hooks for scroll/scale sync.

cc/test/layer_tree_host_remote_for_testing.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/test/layer_tree_host_remote_for_testing.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/animation/animation_host.h"
 #include "cc/blimp/compositor_proto_state.h"
 #include "cc/blimp/compositor_state_deserializer.h"
 #include "cc/blimp/remote_compositor_bridge.h"
+#include "cc/layers/layer.h"
 #include "cc/proto/compositor_message.pb.h"
 #include "cc/test/fake_image_serialization_processor.h"
 #include "cc/test/remote_client_layer_factory.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_host_in_process.h"
 
 namespace cc {
 
 class LayerTreeHostRemoteForTesting::RemoteCompositorBridgeImpl
     : public RemoteCompositorBridge {
@@ skipping 32 matching lines @@
     : public LayerTreeHostClient {
  public:
   LayerTreeHostInProcessClient(
       LayerTreeHostRemoteForTesting* layer_tree_host_remote)
       : layer_tree_host_remote_(layer_tree_host_remote) {}
 
   ~LayerTreeHostInProcessClient() override = default;
 
   void WillBeginMainFrame() override {}
   void BeginMainFrame(const BeginFrameArgs& args) override {
+    // Send any scroll/scale updates first.
+    layer_tree_host_remote_->ApplyUpdatesFromInProcessHost();
     layer_tree_host_remote_->BeginMainFrame();
   }
   void BeginMainFrameNotExpectedSoon() override {}
   void DidBeginMainFrame() override {}
   void UpdateLayerTreeHost() override {
     layer_tree_host_remote_->UpdateStateOnInProcessHost();
   }
   void ApplyViewportDeltas(const gfx::Vector2dF& inner_delta,
                            const gfx::Vector2dF& outer_delta,
                            const gfx::Vector2dF& elastic_overscroll_delta,
                            float page_scale,
-                           float top_controls_delta) override {
-    // TODO(khushalsagar): Hook up when scroll/scale sync is added.
-  }
+                           float top_controls_delta) override {}
   void RequestNewCompositorFrameSink() override {
     layer_tree_host_remote_->client()->RequestNewCompositorFrameSink();
   }
   void DidInitializeCompositorFrameSink() override {
     layer_tree_host_remote_->client()->DidInitializeCompositorFrameSink();
   }
   void DidFailToInitializeCompositorFrameSink() override {
     layer_tree_host_remote_->client()->DidFailToInitializeCompositorFrameSink();
   }
   void WillCommit() override {}
@@ skipping 181 matching lines @@
     const gfx::ScrollOffset& new_offset) {
   return false;
 }
 
 bool LayerTreeHostRemoteForTesting::ShouldRetainClientPageScale(
     float new_page_scale) {
   return false;
 }
 
 void LayerTreeHostRemoteForTesting::LayerDidScroll(int engine_layer_id) {
-  // TODO(khushalsagar): Hook up when scroll/scale sync is added.
+  layers_scrolled_[engine_layer_id] =
+      compositor_state_deserializer_->GetLayerForEngineId(engine_layer_id)
+          ->scroll_offset();
+}
+
+void LayerTreeHostRemoteForTesting::ApplyUpdatesFromInProcessHost() {
+  ApplyScrollAndScaleUpdateFromClient(
+      layers_scrolled_,
+      layer_tree_host_in_process_->GetLayerTree()->page_scale_factor());
+  layers_scrolled_.clear();
 }
 
 void LayerTreeHostRemoteForTesting::RemoteHostNeedsMainFrame() {
   layer_tree_host_in_process_->SetNeedsAnimate();
 }
 
 void LayerTreeHostRemoteForTesting::ProcessRemoteCompositorUpdate(
     std::unique_ptr<CompositorProtoState> compositor_proto_state) {
   pending_compositor_proto_state_ = std::move(compositor_proto_state);
 }
@@ skipping 11 matching lines @@
 
     // The only case where the remote host would give a compositor update is if
     // they wanted the main frame to go till the commit pipeline stage. So
     // request one to make sure that the in process main frame also goes till
     // the commit step.
     layer_tree_host_in_process_->SetNeedsCommit();
   }
 }
 
 }  // namespace cc