| Index: cc/test/test_context_provider.h
|
| diff --git a/cc/test/test_context_provider.h b/cc/test/test_context_provider.h
|
| index 82b3e612d681344d71d0dbf603f51dcfc8f437a7..af5fa846f7ff45ff2ddbde50a7792dc891429c29 100644
|
| --- a/cc/test/test_context_provider.h
|
| +++ b/cc/test/test_context_provider.h
|
| @@ -25,6 +25,9 @@ class TestContextProvider : public ContextProvider {
|
| CreateCallback;
|
|
|
| static scoped_refptr<TestContextProvider> Create();
|
| + // Creates a worker context provider that can be used on any thread. This is
|
| + // equivalent to: Create(); BindToCurrentThread(); SetupLock().
|
| + static scoped_refptr<TestContextProvider> CreateWorker();
|
| static scoped_refptr<TestContextProvider> Create(
|
| scoped_ptr<TestWebGraphicsContext3D> context);
|
|
|
| @@ -39,10 +42,11 @@ class TestContextProvider : public ContextProvider {
|
| base::Lock* GetLock() override;
|
| void VerifyContexts() override;
|
| void DeleteCachedResources() override;
|
| - bool DestroyedOnMainThread() override;
|
| + bool HasBeenLostOnMainThread() override;
|
| void SetLostContextCallback(const LostContextCallback& cb) override;
|
| void SetMemoryPolicyChangedCallback(
|
| const MemoryPolicyChangedCallback& cb) override;
|
| + bool HasBeenDestroyed() override;
|
|
|
| TestWebGraphicsContext3D* TestContext3d();
|
|
|
| @@ -74,8 +78,8 @@ class TestContextProvider : public ContextProvider {
|
| base::ThreadChecker main_thread_checker_;
|
| base::ThreadChecker context_thread_checker_;
|
|
|
| - base::Lock destroyed_lock_;
|
| - bool destroyed_;
|
| + base::Lock lost_lock_;
|
| + bool lost_;
|
|
|
| base::Lock context_lock_;
|
|
|
|
|