| Index: ui/compositor/test/in_process_context_provider.h
|
| diff --git a/ui/compositor/test/in_process_context_provider.h b/ui/compositor/test/in_process_context_provider.h
|
| index e3dfce1565db51f42a7a1d65b0a55686c8cd9aca..d1aab9c39bc84e3a402619d159e97d98d0af25c2 100644
|
| --- a/ui/compositor/test/in_process_context_provider.h
|
| +++ b/ui/compositor/test/in_process_context_provider.h
|
| @@ -49,7 +49,7 @@ class InProcessContextProvider : public cc::ContextProvider {
|
| // cc::ContextProvider:
|
| bool BindToCurrentThread() override;
|
| void DetachFromThread() override;
|
| - Capabilities ContextCapabilities() override;
|
| + gpu::Capabilities ContextCapabilities() override;
|
| gpu::gles2::GLES2Interface* ContextGL() override;
|
| gpu::ContextSupport* ContextSupport() override;
|
| class GrContext* GrContext() override;
|
| @@ -82,7 +82,6 @@ class InProcessContextProvider : public cc::ContextProvider {
|
| gpu::ImageFactory* image_factory_;
|
| gfx::AcceleratedWidget window_;
|
| std::string debug_name_;
|
| - cc::ContextProvider::Capabilities capabilities_;
|
|
|
| base::Lock context_lock_;
|
|
|
|
|