Deliver IPC messages together with SwapCompositorFrame

cc/trees/thread_proxy.cc

Index: cc/trees/thread_proxy.cc
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
index e505e18a899e0eed322aa6c447ccb3d6deb84dc7..1b2a3d12ce6c87a6b6d72b6889a5e648d54b49b8 100644
--- a/cc/trees/thread_proxy.cc
+++ b/cc/trees/thread_proxy.cc
@@ -28,6 +28,8 @@
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "ui/gfx/frame_time.h"
 
+namespace cc {
+
 namespace {
 
 // Measured in seconds.
@@ -37,21 +39,19 @@ unsigned int nextBeginFrameId = 0;
 
 class SwapPromiseChecker {
  public:
-  explicit SwapPromiseChecker(cc::LayerTreeHost* layer_tree_host)
+  explicit SwapPromiseChecker(LayerTreeHost* layer_tree_host)
       : layer_tree_host_(layer_tree_host) {}
 
   ~SwapPromiseChecker() {
-    layer_tree_host_->BreakSwapPromises(cc::SwapPromise::COMMIT_FAILS);
+    layer_tree_host_->BreakSwapPromises(SwapPromise::COMMIT_FAILS);
   }
 
  private:
-  cc::LayerTreeHost* layer_tree_host_;
+  LayerTreeHost* layer_tree_host_;
 };
 
 }  // namespace
 
-namespace cc {
-
 struct ThreadProxy::CommitPendingRequest {
   CompletionEvent completion;
   bool commit_pending;
@@ -855,6 +855,7 @@ void ThreadProxy::BeginMainFrame(
     // went through, and input should no longer be throttled, etc.
     layer_tree_host()->CommitComplete();
     layer_tree_host()->DidBeginMainFrame();
+    layer_tree_host()->BreakSwapPromises(SwapPromise::COMMIT_NO_UPDATE);
     return;
   }