| Index: webkit/common/gpu/context_provider_in_process.h
|
| diff --git a/webkit/common/gpu/context_provider_in_process.h b/webkit/common/gpu/context_provider_in_process.h
|
| index 0e38083eebf5ed32f72ff6c40ddf7fd15437fc7f..e3c9ea1e34b79770b0e146b9480466bfab811c41 100644
|
| --- a/webkit/common/gpu/context_provider_in_process.h
|
| +++ b/webkit/common/gpu/context_provider_in_process.h
|
| @@ -5,16 +5,21 @@
|
| #ifndef WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_
|
| #define WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_
|
|
|
| -#include "base/compiler_specific.h"
|
| +#include <string>
|
| +
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/synchronization/lock.h"
|
| #include "base/threading/thread_checker.h"
|
| -#include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h"
|
| #include "webkit/common/gpu/context_provider_web_context.h"
|
| #include "webkit/common/gpu/webkit_gpu_export.h"
|
|
|
| namespace blink { class WebGraphicsContext3D; }
|
|
|
| +namespace gpu_blink {
|
| +class WebGraphicsContext3DInProcessCommandBufferImpl;
|
| +}
|
| +
|
| namespace webkit {
|
| namespace gpu {
|
| class GrContextForWebGraphicsContext3D;
|
| @@ -31,8 +36,17 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess
|
| static scoped_refptr<ContextProviderInProcess> CreateOffscreen(
|
| bool lose_context_when_out_of_memory);
|
|
|
| + private:
|
| + ContextProviderInProcess(
|
| + scoped_ptr<gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl>
|
| + context3d,
|
| + const std::string& debug_name);
|
| + ~ContextProviderInProcess() override;
|
| +
|
| + // ContextProviderWebContext:
|
| blink::WebGraphicsContext3D* WebContext3D() override;
|
|
|
| + // cc::ContextProvider:
|
| bool BindToCurrentThread() override;
|
| Capabilities ContextCapabilities() override;
|
| ::gpu::gles2::GLES2Interface* ContextGL() override;
|
| @@ -48,16 +62,7 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess
|
| const MemoryPolicyChangedCallback& memory_policy_changed_callback)
|
| override;
|
|
|
| - protected:
|
| - ContextProviderInProcess(
|
| - scoped_ptr<gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl>
|
| - context3d,
|
| - const std::string& debug_name);
|
| - ~ContextProviderInProcess() override;
|
| -
|
| void OnLostContext();
|
| -
|
| - private:
|
| void InitializeCapabilities();
|
|
|
| base::ThreadChecker main_thread_checker_;
|
| @@ -65,7 +70,7 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess
|
|
|
| scoped_ptr<gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl>
|
| context3d_;
|
| - scoped_ptr<webkit::gpu::GrContextForWebGraphicsContext3D> gr_context_;
|
| + scoped_ptr<GrContextForWebGraphicsContext3D> gr_context_;
|
|
|
| LostContextCallback lost_context_callback_;
|
|
|
|
|