| Index: cc/layers/texture_layer.h
|
| diff --git a/cc/layers/texture_layer.h b/cc/layers/texture_layer.h
|
| index 2fa8ad92f4d68590ccd8576a682150fe094ea526..ee245358b35cee90c12a3563fec31a697bceb06d 100644
|
| --- a/cc/layers/texture_layer.h
|
| +++ b/cc/layers/texture_layer.h
|
| @@ -16,6 +16,7 @@
|
| namespace cc {
|
| class BlockingTaskRunner;
|
| class SingleReleaseCallback;
|
| +class SingleReleaseCallbackImpl;
|
| class TextureLayerClient;
|
|
|
| // A Layer containing a the rendered output of a plugin instance.
|
| @@ -40,7 +41,7 @@ class CC_EXPORT TextureLayer : public Layer {
|
|
|
| // Gets a ReleaseCallback that can be called from another thread. Note: the
|
| // caller must ensure the callback is called.
|
| - scoped_ptr<SingleReleaseCallback> GetCallbackForImplThread();
|
| + scoped_ptr<SingleReleaseCallbackImpl> GetCallbackForImplThread();
|
|
|
| protected:
|
| friend class TextureLayer;
|
| @@ -60,10 +61,10 @@ class CC_EXPORT TextureLayer : public Layer {
|
|
|
| void InternalAddRef();
|
| void InternalRelease();
|
| - void ReturnAndReleaseOnImplThread(uint32 sync_point, bool is_lost);
|
| -
|
| - // This member is thread safe, and is accessed on main and impl threads.
|
| - const scoped_refptr<BlockingTaskRunner> message_loop_;
|
| + void ReturnAndReleaseOnImplThread(
|
| + uint32 sync_point,
|
| + bool is_lost,
|
| + scoped_refptr<BlockingTaskRunner> main_thread_task_runner);
|
|
|
| // These members are only accessed on the main thread, or on the impl thread
|
| // during commit where the main thread is blocked.
|
|
|