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

cc/test/layer_tree_host_remote_for_testing.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_TEST_LAYER_TREE_HOST_REMOTE_FOR_TESTING_H_
 #define CC_TEST_LAYER_TREE_HOST_REMOTE_FOR_TESTING_H_
 
 #include "base/macros.h"
-#include "cc/blimp/compositor_state_deserializer_client.h"
+#include "cc/blimp/compositor_state_deserializer.h"
 #include "cc/blimp/layer_tree_host_remote.h"
-#include "ui/gfx/geometry/scroll_offset.h"
 
 namespace gpu {
 class GpuMemoryBufferManager;
 }  // namespace gpu
 
 namespace cc {
-class CompositorStateDeserializer;
 class FakeImageSerializationProcessor;
 class LayerTreeHostInProcess;
 class SharedBitmapManager;
 class TaskGraphRunner;
 
 // This is a version of LayerTreeHostRemote meant to be used for tests that want
 // to inspect the CompositorFrame produced when state updates from the remote
 // host are used by a compositor on the client.
 class LayerTreeHostRemoteForTesting : public LayerTreeHostRemote,
                                       public CompositorStateDeserializerClient {
@@ skipping 39 matching lines @@
       TaskGraphRunner* task_graph_runner,
       const LayerTreeSettings& settings,
       scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
 
  private:
   class LayerTreeHostInProcessClient;
   class RemoteCompositorBridgeImpl;
 
   // CompositorStateDeserializerClient implementation.
-  bool ShouldRetainClientScroll(int engine_layer_id,
-                                const gfx::ScrollOffset& new_offset) override;
-  bool ShouldRetainClientPageScale(float new_page_scale) override;
+  void DidUpdateLocalState() override;
 
   // LayerTreeHostRemote interface.
   void DispatchDrawAndSubmitCallbacks() override;
 
-  void LayerDidScroll(int engine_layer_id);
-  void ApplyUpdatesFromInProcessHost();
+  void BeginRemoteMainFrame();
 
   void RemoteHostNeedsMainFrame();
   void ProcessRemoteCompositorUpdate(
       std::unique_ptr<CompositorProtoState> compositor_proto_state);
 
   std::unique_ptr<LayerTreeHostInProcess> layer_tree_host_in_process_;
   std::unique_ptr<CompositorStateDeserializer> compositor_state_deserializer_;
 
-  ScrollOffsetMap layers_scrolled_;
+  bool client_state_dirty_ = false;
 
   std::unique_ptr<LayerTreeHostInProcessClient>
       layer_tree_host_in_process_client_;
 
   std::unique_ptr<FakeImageSerializationProcessor>
       image_serialization_processor_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerTreeHostRemoteForTesting);
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_LAYER_TREE_HOST_REMOTE_FOR_TESTING_H_