Add BlimpDocument, pull out functions in BlimpCompositor.

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>
 
@@ skipping 39 matching lines @@
 
 // The BlimpCompositorClient provides the BlimpCompositor with the necessary
 // dependencies for cc::LayerTreeHost owned by this compositor and for
 // communicating the compositor and input messages to the corresponding
 // render widget of this compositor on the engine.
 class BlimpCompositorClient {
  public:
   // Should send web gesture events which could not be handled locally by the
   // compositor to the engine.
   virtual void SendWebGestureEvent(
-      int render_widget_id,
       const blink::WebGestureEvent& gesture_event) = 0;
 
   // Should send the compositor messages from the remote client LayerTreeHost of
   // this compositor to the corresponding remote server LayerTreeHost.
   virtual void SendCompositorMessage(
-      int render_widget_id,
       const cc::proto::CompositorMessage& message) = 0;
 
  protected:
   virtual ~BlimpCompositorClient() {}
 };
 
 // BlimpCompositor provides the basic framework and setup to host a
 // LayerTreeHost. This class owns the remote client cc::LayerTreeHost, which
 // 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 BlimpInputManagerClient,
                         public BlimpCompositorFrameSinkProxy,
                         public cc::SurfaceFactoryClient {
  public:
-  BlimpCompositor(const int render_widget_id,
-                  BlimpCompositorDependencies* compositor_dependencies,
+  BlimpCompositor(BlimpCompositorDependencies* compositor_dependencies,
                   BlimpCompositorClient* client);
 
   ~BlimpCompositor() override;
 
   virtual void SetVisible(bool visible);
 
   // Forwards the touch event to the |input_manager_|.
   // virtual for testing.
   virtual bool OnTouchEvent(const ui::MotionEvent& motion_event);
 
   // 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);
 
   // Called to forward the compositor message from the remote server
   // LayerTreeHost of the render widget for this compositor.
   // virtual for testing.
   virtual void OnCompositorMessageReceived(
       std::unique_ptr<cc::proto::CompositorMessage> message);
 
   scoped_refptr<cc::Layer> layer() const { return layer_; }
 
-  int render_widget_id() const { return render_widget_id_; }
-
  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 ApplyViewportDeltas(const gfx::Vector2dF& inner_delta,
@@ skipping 50 matching lines @@
 
   // Helper method to destroy the internal CC LayerTreeHost instance and all its
   // associated state.
   void DestroyLayerTreeHost();
 
   // 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);
 
-  // The unique identifier for the render widget for this compositor.
-  const int render_widget_id_;
-
   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 38 matching lines @@
 
   base::WeakPtrFactory<BlimpCompositor> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpCompositor);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_