cc: Fix overwriting of commit completion event in MFBA mode.

cc/trees/proxy_impl.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 CC_TREES_PROXY_IMPL_H_
 #define CC_TREES_PROXY_IMPL_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 30 matching lines @@
   virtual void SetDeferCommitsOnImpl(bool defer_commits) const;
   virtual void SetNeedsRedrawOnImpl(const gfx::Rect& damage_rect);
   virtual void SetNeedsCommitOnImpl();
   virtual void BeginMainFrameAbortedOnImpl(
       CommitEarlyOutReason reason,
       base::TimeTicks main_thread_start_time);
   virtual void FinishAllRenderingOnImpl(CompletionEvent* completion);
   virtual void SetVisibleOnImpl(bool visible);
   virtual void ReleaseOutputSurfaceOnImpl(CompletionEvent* completion);
   virtual void FinishGLOnImpl(CompletionEvent* completion);
-  virtual void MainFrameWillHappenOnImplForTesting(
-      CompletionEvent* completion,
-      bool* main_frame_will_happen);
   virtual void StartCommitOnImpl(CompletionEvent* completion,
                                  LayerTreeHost* layer_tree_host,
                                  base::TimeTicks main_thread_start_time,
                                  bool hold_commit_for_activation);
 
+  void MainFrameWillHappenOnImplForTesting(CompletionEvent* completion,
+                                           bool* main_frame_will_happen);
+  void BlockNotifyReadyToActivateForTesting(bool block);
+
  protected:
   // protected for testing.
   ProxyImpl(ChannelImpl* channel_impl,
             LayerTreeHost* layer_tree_host,
             TaskRunnerProvider* task_runner_provider,
             std::unique_ptr<BeginFrameSource> external_begin_frame_source);
 
  private:
   // The members of this struct should be accessed on the impl thread only when
   // the main thread is blocked for a commit.
@@ skipping 54 matching lines @@
   DrawResult DrawAndSwapInternal(bool forced_draw);
 
   bool IsImplThread() const;
   bool IsMainThreadBlocked() const;
 
   const int layer_tree_host_id_;
 
   std::unique_ptr<Scheduler> scheduler_;
 
   // Set when the main thread is waiting on a pending tree activation.
-  bool next_commit_waits_for_activation_;
+  bool commit_completion_waits_for_activation_;
 
-  // Set when the main thread is waiting on a commit to complete or on a
-  // pending tree activation.
+  // Set when the main thread is waiting on a commit to complete.
   CompletionEvent* commit_completion_event_;
 
+  // Set when the main thread is waiting for activation to complete.
+  CompletionEvent* activation_completion_event_;
+
   // Set when the next draw should post DidCommitAndDrawFrame to the main
   // thread.
   bool next_frame_is_newly_committed_frame_;
 
   bool inside_draw_;
   bool input_throttled_until_commit_;
 
   TaskRunnerProvider* task_runner_provider_;
 
   DelayedUniqueNotifier smoothness_priority_expiration_notifier_;
@@ skipping 11 matching lines @@
   // Use accessors instead of this variable directly.
   BlockedMainCommitOnly main_thread_blocked_commit_vars_unsafe_;
   BlockedMainCommitOnly& blocked_main_commit();
 
   DISALLOW_COPY_AND_ASSIGN(ProxyImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_PROXY_IMPL_H_