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

cc/blimp/layer_tree_host_remote.h

 // 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.
 
 #ifndef CC_BLIMP_LAYER_TREE_HOST_REMOTE_H_
 #define CC_BLIMP_LAYER_TREE_HOST_REMOTE_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "cc/base/cc_export.h"
@@ skipping 77 matching lines @@
   int ScheduleMicroBenchmark(
       const std::string& benchmark_name,
       std::unique_ptr<base::Value> value,
       const MicroBenchmark::DoneCallback& callback) override;
   bool SendMessageToMicroBenchmark(int id,
                                    std::unique_ptr<base::Value> value) override;
   SurfaceSequenceGenerator* GetSurfaceSequenceGenerator() override;
   void SetNextCommitWaitsForActivation() override;
   void ResetGpuRasterizationTracking() override;
 
+  // RemoteCompositorBridgeClient implementation.
+  void BeginMainFrame() override;
+  void ApplyStateUpdateFromClient(
+      const proto::ClientStateUpdate& client_state_update) override;
+
  protected:
   // Protected for testing. Allows tests to inject the LayerTree.
   LayerTreeHostRemote(InitParams* params,
                       std::unique_ptr<LayerTree> layer_tree);
 
   LayerTreeHostClient* client() const { return client_; }
   RemoteCompositorBridge* remote_compositor_bridge() const {
     return remote_compositor_bridge_.get();
   }
 
   virtual void DispatchDrawAndSubmitCallbacks();
   void SetTaskRunnerProviderForTesting(
       std::unique_ptr<TaskRunnerProvider> task_runner_provider);
 
-  // RemoteCompositorBridgeClient implementation.
-  void BeginMainFrame() override;
-  bool ApplyScrollAndScaleUpdateFromClient(
-      const ScrollOffsetMap& client_scroll_map,
-      float client_page_scale) override;
-
  private:
   enum class FramePipelineStage { NONE, ANIMATE, UPDATE_LAYERS, COMMIT };
 
   void MainFrameRequested(FramePipelineStage requested_pipeline_stage);
   void ScheduleMainFrameIfNecessary();
   void MainFrameComplete();
   void SerializeCurrentState(proto::LayerTreeHost* layer_tree_host_proto);
 
   const int id_;
   int source_frame_number_ = 0;
@@ skipping 44 matching lines @@
   SurfaceSequenceGenerator surface_sequence_generator_;
 
   base::WeakPtr<InputHandler> input_handler_weak_ptr_;
 
   base::WeakPtrFactory<LayerTreeHostRemote> weak_factory_;
 };
 
 }  // namespace cc
 
 #endif  // CC_BLIMP_LAYER_TREE_HOST_REMOTE_H_