Index: cc/trees/thread_proxy.h |
diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h |
index 8122bf4e7d1bc873edce164b3c9d92a15a9dfcf3..b19dcb9c89b1cbf1c3bab7a0ff6707cd434e8c08 100644 |
--- a/cc/trees/thread_proxy.h |
+++ b/cc/trees/thread_proxy.h |
@@ -93,10 +93,10 @@ class ThreadProxy : public Proxy, |
// SchedulerClient implementation |
virtual void SetNeedsBeginFrameOnImplThread(bool enable) OVERRIDE; |
virtual void ScheduledActionSendBeginFrameToMainThread() OVERRIDE; |
- virtual ScheduledActionDrawAndSwapResult |
- ScheduledActionDrawAndSwapIfPossible() OVERRIDE; |
- virtual ScheduledActionDrawAndSwapResult ScheduledActionDrawAndSwapForced() |
+ virtual DrawSwapReadbackResult ScheduledActionDrawAndSwapIfPossible() |
OVERRIDE; |
+ virtual DrawSwapReadbackResult ScheduledActionDrawAndSwapForced() OVERRIDE; |
+ virtual DrawSwapReadbackResult ScheduledActionDrawAndReadback() OVERRIDE; |
virtual void ScheduledActionCommit() OVERRIDE; |
virtual void ScheduledActionUpdateVisibleTiles() OVERRIDE; |
virtual void ScheduledActionActivatePendingTree() OVERRIDE; |
@@ -142,7 +142,9 @@ class ThreadProxy : public Proxy, |
struct CommitPendingRequest; |
struct SchedulerStateRequest; |
- void ForceCommitOnImplThread(CompletionEvent* completion); |
+ void ForceCommitForReadbackOnImplThread( |
+ CompletionEvent* begin_frame_sent_completion, |
+ ReadbackRequest* request); |
void StartCommitOnImplThread( |
CompletionEvent* completion, |
ResourceUpdateQueue* queue, |
@@ -167,8 +169,9 @@ class ThreadProxy : public Proxy, |
void LayerTreeHostClosedOnImplThread(CompletionEvent* completion); |
void AcquireLayerTexturesForMainThreadOnImplThread( |
CompletionEvent* completion); |
- ScheduledActionDrawAndSwapResult ScheduledActionDrawAndSwapInternal( |
- bool forced_draw); |
+ DrawSwapReadbackResult DrawSwapReadbackInternal(bool forced_draw, |
+ bool swap_requested, |
+ bool readback_requested); |
void ForceSerializeOnSwapBuffersOnImplThread(CompletionEvent* completion); |
void CheckOutputSurfaceStatusOnImplThread(); |
void CommitPendingOnImplThreadForTesting(CommitPendingRequest* request); |