| Index: cc/thread_proxy.h
|
| diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h
|
| index 283761df04c4213fd3e03da72303c64f975a8862..c1645398f0724e61813819c7385663aac62b849b 100644
|
| --- a/cc/thread_proxy.h
|
| +++ b/cc/thread_proxy.h
|
| @@ -63,17 +63,21 @@ public:
|
| virtual void onCanDrawStateChanged(bool canDraw) OVERRIDE;
|
| virtual void onHasPendingTreeStateChanged(bool hasPendingTree) OVERRIDE;
|
| virtual void setNeedsRedrawOnImplThread() OVERRIDE;
|
| + virtual void didSwapUseIncompleteTextureOnImplThread() OVERRIDE;
|
| + virtual void didUploadVisibleHighResolutionTileOnImplTread() OVERRIDE;
|
| virtual void setNeedsCommitOnImplThread() OVERRIDE;
|
| virtual void setNeedsManageTilesOnImplThread() OVERRIDE;
|
| virtual void postAnimationEventsToMainThreadOnImplThread(scoped_ptr<AnimationEventsVector>, base::Time wallClockTime) OVERRIDE;
|
| virtual bool reduceContentsTextureMemoryOnImplThread(size_t limitBytes, int priorityCutoff) OVERRIDE;
|
| virtual void sendManagedMemoryStats() OVERRIDE;
|
| + virtual bool isInsideDraw() OVERRIDE;
|
|
|
| // SchedulerClient implementation
|
| virtual void scheduledActionBeginFrame() OVERRIDE;
|
| virtual ScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapIfPossible() OVERRIDE;
|
| virtual ScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapForced() OVERRIDE;
|
| virtual void scheduledActionCommit() OVERRIDE;
|
| + virtual void scheduledActionCheckForCompletedTextures() OVERRIDE;
|
| virtual void scheduledActionActivatePendingTreeIfNeeded() OVERRIDE;
|
| virtual void scheduledActionBeginContextRecreation() OVERRIDE;
|
| virtual void scheduledActionAcquireLayerTexturesForMainThread() OVERRIDE;
|
| @@ -191,6 +195,8 @@ private:
|
|
|
| bool m_renderVSyncEnabled;
|
|
|
| + bool m_insideDraw;
|
| +
|
| base::TimeDelta m_totalCommitTime;
|
| size_t m_totalCommitCount;
|
|
|
|
|