Merge 167537 - Use message passing for BeginFrameAndCommitState and clean up forced commit logic

cc/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 CCThreadProxy_h
 #define CCThreadProxy_h
 
 #include "base/time.h"
 #include "cc/animation_events.h"
 #include "cc/completion_event.h"
@@ skipping 63 matching lines @@
     virtual void scheduledActionAcquireLayerTexturesForMainThread() OVERRIDE;
     virtual void didAnticipatedDrawTimeChange(base::TimeTicks) OVERRIDE;
 
     // ResourceUpdateControllerClient implementation
     virtual void readyToFinalizeTextureUpdates() OVERRIDE;
 
 private:
     explicit ThreadProxy(LayerTreeHost*);
     friend class ThreadProxyContextRecreationTimer;
 
-    // Set on impl thread, read on main thread.
     struct BeginFrameAndCommitState {
         BeginFrameAndCommitState();
         ~BeginFrameAndCommitState();
 
         base::TimeTicks monotonicFrameBeginTime;
         scoped_ptr<ScrollAndScaleSet> scrollInfo;
         WebKit::WebTransformationMatrix implTransform;
         PrioritizedTextureManager::BackingList evictedContentsTexturesBackings;
         size_t memoryAllocationLimitBytes;
     };
-    scoped_ptr<BeginFrameAndCommitState> m_pendingBeginFrameRequest;
 
     // Called on main thread
-    void beginFrame();
+    void beginFrame(BeginFrameAndCommitState* beginFrameState);
     void didCommitAndDrawFrame();
     void didCompleteSwapBuffers();
     void setAnimationEvents(AnimationEventsVector*, base::Time wallClockTime);
     void beginContextRecreation();
     void tryToRecreateContext();
 
     // Called on impl thread
     struct ReadbackRequest {
         CompletionEvent completion;
         bool success;
@@ skipping 17 matching lines @@
     void recreateContextOnImplThread(CompletionEvent*, GraphicsContext*, bool* recreateSucceeded, RendererCapabilities*);
     void renderingStatsOnImplThread(CompletionEvent*, RenderingStats*);
     ScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapInternal(bool forcedDraw);
     void forceSerializeOnSwapBuffersOnImplThread(CompletionEvent*);
     void setNeedsForcedCommitOnImplThread();
 
     // Accessed on main thread only.
     bool m_animateRequested; // Set only when setNeedsAnimate is called.
     bool m_commitRequested; // Set only when setNeedsCommit is called.
     bool m_commitRequestSentToImplThread; // Set by setNeedsCommit and setNeedsAnimate.
-    bool m_forcedCommitRequested;
     scoped_ptr<ThreadProxyContextRecreationTimer> m_contextRecreationTimer;
     LayerTreeHost* m_layerTreeHost;
     bool m_rendererInitialized;
     RendererCapabilities m_RendererCapabilitiesMainThreadCopy;
     bool m_started;
     bool m_texturesAcquired;
     bool m_inCompositeAndReadback;
 
     scoped_ptr<LayerTreeHostImpl> m_layerTreeHostImpl;
 
@@ skipping 23 matching lines @@
 
     // Set when the next draw should post didCommitAndDrawFrame to the main thread.
     bool m_nextFrameIsNewlyCommittedFrameOnImplThread;
 
     bool m_renderVSyncEnabled;
 
     base::TimeDelta m_totalCommitTime;
     size_t m_totalCommitCount;
 
     bool m_deferCommits;
-    bool m_deferredCommitPending;
+    scoped_ptr<BeginFrameAndCommitState> m_pendingDeferredCommit;
 };
 
 }  // namespace cc
 
 #endif