Index: cc/thread_proxy.h |
=================================================================== |
--- cc/thread_proxy.h (revision 168251) |
+++ cc/thread_proxy.h (working copy) |
@@ -81,7 +81,6 @@ |
explicit ThreadProxy(LayerTreeHost*); |
friend class ThreadProxyContextRecreationTimer; |
- // Set on impl thread, read on main thread. |
struct BeginFrameAndCommitState { |
BeginFrameAndCommitState(); |
~BeginFrameAndCommitState(); |
@@ -92,10 +91,9 @@ |
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); |
@@ -133,7 +131,6 @@ |
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; |
@@ -177,7 +174,7 @@ |
size_t m_totalCommitCount; |
bool m_deferCommits; |
- bool m_deferredCommitPending; |
+ scoped_ptr<BeginFrameAndCommitState> m_pendingDeferredCommit; |
}; |
} // namespace cc |