blimp: Add mode to use the updated compositing path on the client.

blimp/client/core/compositor/blimp_compositor.h

 // Copyright 2015 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 BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_
 #define BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_
 
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_checker.h"
 #include "blimp/client/core/compositor/blimp_compositor_frame_sink_proxy.h"
 #include "blimp/client/public/compositor/compositor_dependencies.h"
+#include "cc/blimp/compositor_state_deserializer_client.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_settings.h"
 #include "cc/trees/remote_proto_channel.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 class Thread;
 }  // namespace base
 
 namespace cc {
 class InputHandler;
 
 namespace proto {
 class CompositorMessage;
 }  // namespace proto
 
+class CompositorStateDeserializer;
 class ContextProvider;
 class Layer;
 class LayerTreeHost;
 class LayerTreeSettings;
 class LocalFrameid;
 class Surface;
 class SurfaceFactory;
 class SurfaceIdAllocator;
 }  // namespace cc
 
@@ skipping 24 matching lines @@
 // performs the compositing work for the remote server LayerTreeHost. The server
 // LayerTreeHost for a BlimpCompositor is owned by the
 // content::RenderWidgetCompositor. Thus, each BlimpCompositor is tied to a
 // RenderWidget, identified by a custom |render_widget_id| generated on the
 // engine. The lifetime of this compositor is controlled by its corresponding
 // RenderWidget.
 // This class should only be accessed from the main thread.
 class BlimpCompositor : public cc::LayerTreeHostClient,
                         public cc::RemoteProtoChannel,
                         public BlimpCompositorFrameSinkProxy,
-                        public cc::SurfaceFactoryClient {
+                        public cc::SurfaceFactoryClient,
+                        public cc::CompositorStateDeserializerClient {
  public:
   BlimpCompositor(BlimpCompositorDependencies* compositor_dependencies,
-                  BlimpCompositorClient* client);
+                  BlimpCompositorClient* client,
+                  bool use_threaded_layer_tree_host);
 
   ~BlimpCompositor() override;
 
   virtual void SetVisible(bool visible);
 
   // Notifies |callback| when all pending commits have been drawn to the screen.
   // If this compositor is destroyed or becomes hidden |callback| will be
   // notified.
   void NotifyWhenDonePendingCommits(base::Closure callback);
 
@@ skipping 10 matching lines @@
   const base::WeakPtr<cc::InputHandler>& GetInputHandler();
 
  private:
   friend class BlimpCompositorForTesting;
 
   // LayerTreeHostClient implementation.
   void WillBeginMainFrame() override {}
   void DidBeginMainFrame() override {}
   void BeginMainFrame(const cc::BeginFrameArgs& args) override {}
   void BeginMainFrameNotExpectedSoon() override {}
-  void UpdateLayerTreeHost() override {}
+  void UpdateLayerTreeHost() override;
   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 {}
   void RequestNewCompositorFrameSink() override;
   void DidInitializeCompositorFrameSink() override;
   // TODO(khushalsagar): Need to handle context initialization failures.
   void DidFailToInitializeCompositorFrameSink() override {}
   void WillCommit() override {}
   void DidCommit() override {}
   void DidCommitAndDrawFrame() override;
   void DidReceiveCompositorFrameAck() override {}
   void DidCompletePageScaleAnimation() override {}
 
   // RemoteProtoChannel implementation.
   void SetProtoReceiver(ProtoReceiver* receiver) override;
   void SendCompositorProto(const cc::proto::CompositorMessage& proto) override;
 
   // BlimpCompositorFrameSinkProxy implementation.
   void BindToProxyClient(
       base::WeakPtr<BlimpCompositorFrameSinkProxyClient> proxy_client) override;
   void SubmitCompositorFrame(cc::CompositorFrame frame) override;
   void UnbindProxyClient() override;
 
   // SurfaceFactoryClient implementation.
   void ReturnResources(const cc::ReturnedResourceArray& resources) override;
   void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override {}
 
+  // CompositorStateDeserializerClient implementation.
+  bool ShouldRetainClientScroll(int engine_layer_id,
+                                const gfx::ScrollOffset& new_offset) override;
+  bool ShouldRetainClientPageScale(float new_page_scale) override;
+
+  void HandleCompositorMessageToImpl(
+      std::unique_ptr<cc::proto::CompositorMessage> message);
+
   // Called when the a ContextProvider has been created by the
   // CompositorDependencies class.  If |host_| is waiting on an
   // CompositorFrameSink this will build one for it.
   void OnContextProvidersCreated(
       const scoped_refptr<cc::ContextProvider>& compositor_context_provider,
       const scoped_refptr<cc::ContextProvider>& worker_context_provider);
 
   // Helper method to get the embedder dependencies.
   CompositorDependencies* GetEmbedderDeps();
 
@@ skipping 12 matching lines @@
 
   // Updates |pending_commit_trackers_|, decrementing the count and, if 0,
   // notifying the callback.  If |flush| is true, flushes all entries regardless
   // of the count.
   void CheckPendingCommitCounts(bool flush);
 
   // Acks a submitted CompositorFrame when it has been processed and another
   // frame should be started.
   void SubmitCompositorFrameAck();
 
+  // Called when the local copy of the layer with |engine_layer_id| on the
+  // engine was scrolled on the compositor thread.
+  void LayerScrolled(int engine_layer_id);
+
+  // Set to true if we are using a LayerTreeHostInProcess to process frame
+  // updates from the engine.
+  const bool use_threaded_layer_tree_host_;
+
   BlimpCompositorClient* client_;
 
   BlimpCompositorDependencies* compositor_dependencies_;
 
   cc::FrameSinkId frame_sink_id_;
 
   std::unique_ptr<cc::LayerTreeHost> host_;
 
   // The SurfaceFactory is bound to the lifetime of the |proxy_client_|. When
   // detached, the surface factory will be destroyed.
@@ skipping 22 matching lines @@
   // DidCommitAndDrawFrame hasn't been seen.  This should track the number of
   // outstanding commits.
   size_t outstanding_commits_;
 
   // When NotifyWhenDonePendingCommitsis called |outstanding_commits_| is copied
   // along with the |callback| into this vector.  Each time
   // DidCommitAndDrawFrame is called these entries get decremented.  If they hit
   // 0 the callback is triggered.
   std::vector<std::pair<size_t, base::Closure>> pending_commit_trackers_;
 
+  // Stores a frame update received from the engine, when a threaded
+  // LayerTreeHost is used. There can only be a single frame in flight at any
+  // point.
+  std::unique_ptr<cc::proto::CompositorMessage> pending_frame_update_;
+
+  // Used with a threaded LayerTreeHost to deserialize proto updates from the
+  // engine into the LayerTree.
+  std::unique_ptr<cc::CompositorStateDeserializer>
+      compositor_state_deserializer_;
+
   base::WeakPtrFactory<BlimpCompositor> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpCompositor);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_