Add a full Blimp integration test.

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 "blimp/client/core/compositor/blimp_output_surface.h"
 #include "blimp/client/core/input/blimp_input_manager.h"
 #include "blimp/client/public/compositor/compositor_dependencies.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"
@@ skipping 70 matching lines @@
                   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_; }
 
@@ skipping 55 matching lines @@
   void DestroyDelegatedContent();
 
   // Helper method to build the internal CC LayerTreeHost instance from
   // |message|.
   void CreateLayerTreeHost();
 
   // 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_;
 
   std::unique_ptr<cc::LayerTreeHostInterface> host_;
 
   // The SurfaceFactory is bound to the lifetime of the BlimpOutputSurface. When
@@ skipping 19 matching lines @@
   // to |render_widget_id_|.
   cc::RemoteProtoChannel::ProtoReceiver* remote_proto_channel_receiver_;
 
   // Handles input events for the current render widget. The lifetime of the
   // input manager is tied to the lifetime of the |host_| which owns the
   // cc::InputHandler. The input events are forwarded to this input handler by
   // the manager to be handled by the client compositor for the current render
   // widget.
   std::unique_ptr<BlimpInputManager> input_manager_;
 
+  // The number of times a START_COMMIT proto has been received but a call to
+  // 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_;
+
   base::WeakPtrFactory<BlimpCompositor> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpCompositor);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_