| Index: content/browser/android/in_process/context_provider_in_process.h
|
| diff --git a/content/browser/android/in_process/context_provider_in_process.h b/content/browser/android/in_process/context_provider_in_process.h
|
| index 8baf1c4d868e4b23b2a4174661f03f7c4b879f11..8b3551b2fde59ff2786a9b7549c7baf0b0f1e67d 100644
|
| --- a/content/browser/android/in_process/context_provider_in_process.h
|
| +++ b/content/browser/android/in_process/context_provider_in_process.h
|
| @@ -48,9 +48,9 @@ class ContextProviderInProcess
|
| // cc::ContextProvider:
|
| bool BindToCurrentThread() override;
|
| void DetachFromThread() override;
|
| - Capabilities ContextCapabilities() override;
|
| - ::gpu::gles2::GLES2Interface* ContextGL() override;
|
| - ::gpu::ContextSupport* ContextSupport() override;
|
| + gpu::Capabilities ContextCapabilities() override;
|
| + gpu::gles2::GLES2Interface* ContextGL() override;
|
| + gpu::ContextSupport* ContextSupport() override;
|
| class GrContext* GrContext() override;
|
| void InvalidateGrContext(uint32_t state) override;
|
| void SetupLock() override;
|
| @@ -60,7 +60,6 @@ class ContextProviderInProcess
|
| const LostContextCallback& lost_context_callback) override;
|
|
|
| void OnLostContext();
|
| - void InitializeCapabilities();
|
|
|
| base::ThreadChecker main_thread_checker_;
|
| base::ThreadChecker context_thread_checker_;
|
| @@ -76,8 +75,6 @@ class ContextProviderInProcess
|
| class LostContextCallbackProxy;
|
| std::unique_ptr<LostContextCallbackProxy> lost_context_callback_proxy_;
|
|
|
| - cc::ContextProvider::Capabilities capabilities_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(ContextProviderInProcess);
|
| };
|
|
|
|
|