cc: If SetDeferCommits(true) happens inside the main frame, abort it.

cc/trees/single_thread_proxy.h

 // Copyright 2011 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_SINGLE_THREAD_PROXY_H_
 #define CC_TREES_SINGLE_THREAD_PROXY_H_
 
 #include <limits>
 
 #include "base/cancelable_callback.h"
@@ skipping 94 matching lines @@
 
  protected:
   SingleThreadProxy(LayerTreeHost* layer_tree_host,
                     LayerTreeHostSingleThreadClient* client,
                     TaskRunnerProvider* task_runner_provider);
 
  private:
   void BeginMainFrame(const BeginFrameArgs& begin_frame_args);
   void BeginMainFrameAbortedOnImplThread(CommitEarlyOutReason reason);
   void DoBeginMainFrame(const BeginFrameArgs& begin_frame_args);
+  void DoPainting();
   void DoCommit();
   DrawResult DoComposite(LayerTreeHostImpl::FrameData* frame);
   void DoSwap();
   void DidCommitAndDrawFrame();
   void CommitComplete();
 
   bool ShouldComposite() const;
   void ScheduleRequestNewCompositorFrameSink();
 
   // Accessed on main thread only.
@@ skipping 108 matching lines @@
  private:
   DebugScopedSetImplThread impl_thread_;
   DebugScopedSetMainThreadBlocked main_thread_blocked_;
 
   DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_SINGLE_THREAD_PROXY_H_