| Index: cc/thread_proxy.h
|
| diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h
|
| index 9e383bbc7b0ab6caedc5a5d39272385023498528..126fadaa64a9240416126588835ece8843efb5fe 100644
|
| --- a/cc/thread_proxy.h
|
| +++ b/cc/thread_proxy.h
|
| @@ -65,8 +65,10 @@ public:
|
| virtual void onHasPendingTreeStateChanged(bool hasPendingTree) OVERRIDE;
|
| virtual void setNeedsRedrawOnImplThread() OVERRIDE;
|
| virtual void didUploadVisibleHighResolutionTileOnImplThread() OVERRIDE;
|
| + virtual void didDetectIdleRasterOnImplThread() OVERRIDE;
|
| virtual void setNeedsCommitOnImplThread() OVERRIDE;
|
| virtual void setNeedsManageTilesOnImplThread() OVERRIDE;
|
| + virtual void setNeedsCheckForCompletedRasterTasksOnImplThread() OVERRIDE;
|
| virtual void postAnimationEventsToMainThreadOnImplThread(scoped_ptr<AnimationEventsVector>, base::Time wallClockTime) OVERRIDE;
|
| virtual bool reduceContentsTextureMemoryOnImplThread(size_t limitBytes, int priorityCutoff) OVERRIDE;
|
| virtual void reduceWastedContentsTextureMemoryOnImplThread() OVERRIDE;
|
| @@ -135,6 +137,7 @@ private:
|
| void initializeRendererOnImplThread(CompletionEvent*, bool* initializeSucceeded, RendererCapabilities*);
|
| void layerTreeHostClosedOnImplThread(CompletionEvent*);
|
| void manageTilesOnImplThread();
|
| + void checkForCompletedRasterTasksOnImplThread();
|
| void setFullRootLayerDamageOnImplThread();
|
| void acquireLayerTexturesForMainThreadOnImplThread(CompletionEvent*);
|
| void recreateOutputSurfaceOnImplThread(CompletionEvent*, scoped_ptr<OutputSurface>, bool* recreateSucceeded, RendererCapabilities*);
|
| @@ -161,6 +164,7 @@ private:
|
| bool m_texturesAcquired;
|
| bool m_inCompositeAndReadback;
|
| bool m_manageTilesPending;
|
| + bool m_checkForCompletedRasterTasksPending;
|
| // Weak pointer to use when posting tasks to the impl thread.
|
| base::WeakPtr<ThreadProxy> m_implThreadWeakPtr;
|
|
|
| @@ -169,6 +173,9 @@ private:
|
| base::WeakPtr<ThreadProxy> m_mainThreadWeakPtr;
|
| base::WeakPtrFactory<ThreadProxy> m_weakFactory;
|
|
|
| + base::WeakPtrFactory<ThreadProxy>
|
| + m_weakCheckForCompletedRasterTasksFactory;
|
| +
|
| scoped_ptr<LayerTreeHostImpl> m_layerTreeHostImpl;
|
|
|
| scoped_ptr<InputHandler> m_inputHandlerOnImplThread;
|
|
|