Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2236)

Unified Diff: cc/thread_proxy.h

Issue 11362054: Use message passing for BeginFrameAndCommitState and clean up forced commit logic (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/thread_proxy.h
diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h
index 12496872d44a182df596178409b26e67b5641d29..955752758c8a41bc1f295d931f69d62855347c1a 100644
--- a/cc/thread_proxy.h
+++ b/cc/thread_proxy.h
@@ -79,7 +79,6 @@ public:
private:
explicit ThreadProxy(LayerTreeHost*);
- // Set on impl thread, read on main thread.
struct BeginFrameAndCommitState {
BeginFrameAndCommitState();
~BeginFrameAndCommitState();
@@ -90,10 +89,9 @@ private:
PrioritizedTextureManager::BackingList evictedContentsTexturesBackings;
size_t memoryAllocationLimitBytes;
};
- scoped_ptr<BeginFrameAndCommitState> m_pendingBeginFrameRequest;
// Called on main thread
- void beginFrame();
+ void beginFrame(scoped_ptr<BeginFrameAndCommitState> beginFrameState);
void didCommitAndDrawFrame();
void didCompleteSwapBuffers();
void setAnimationEvents(scoped_ptr<AnimationEventsVector>, base::Time wallClockTime);
@@ -131,7 +129,6 @@ private:
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;
base::CancelableClosure m_contextRecreationCallback;
LayerTreeHost* m_layerTreeHost;
bool m_rendererInitialized;
@@ -175,7 +172,7 @@ private:
size_t m_totalCommitCount;
bool m_deferCommits;
- bool m_deferredCommitPending;
+ scoped_ptr<BeginFrameAndCommitState> m_pendingDeferredCommit;
};
} // namespace cc

Powered by Google App Engine
This is Rietveld 408576698