diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/webkit/common/gpu/context_provider_in_process.h | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/webkit/common/gpu/context_provider_in_process.h')
| -rw-r--r-- | chromium/webkit/common/gpu/context_provider_in_process.h | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/chromium/webkit/common/gpu/context_provider_in_process.h b/chromium/webkit/common/gpu/context_provider_in_process.h index 90c5e69a2d5..72098b26d00 100644 --- a/chromium/webkit/common/gpu/context_provider_in_process.h +++ b/chromium/webkit/common/gpu/context_provider_in_process.h @@ -13,10 +13,7 @@ #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" #include "webkit/common/gpu/webkit_gpu_export.h" -namespace WebKit { -class WebGraphicsContext3D; -struct WebGraphicsMemoryAllocation; -} +namespace blink { class WebGraphicsContext3D; } namespace webkit { namespace gpu { @@ -35,15 +32,16 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess virtual bool BindToCurrentThread() OVERRIDE; virtual Capabilities ContextCapabilities() OVERRIDE; - virtual WebKit::WebGraphicsContext3D* Context3d() OVERRIDE; + virtual blink::WebGraphicsContext3D* Context3d() OVERRIDE; + virtual ::gpu::gles2::GLES2Interface* ContextGL() OVERRIDE; + virtual ::gpu::ContextSupport* ContextSupport() OVERRIDE; virtual class GrContext* GrContext() OVERRIDE; + virtual void MakeGrContextCurrent() OVERRIDE; + virtual bool IsContextLost() OVERRIDE; virtual void VerifyContexts() OVERRIDE; virtual bool DestroyedOnMainThread() OVERRIDE; virtual void SetLostContextCallback( const LostContextCallback& lost_context_callback) OVERRIDE; - virtual void SetSwapBuffersCompleteCallback( - const SwapBuffersCompleteCallback& swap_buffers_complete_callback) - OVERRIDE; virtual void SetMemoryPolicyChangedCallback( const MemoryPolicyChangedCallback& memory_policy_changed_callback) OVERRIDE; @@ -55,11 +53,10 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess virtual ~ContextProviderInProcess(); void OnLostContext(); - void OnSwapBuffersComplete(); - void OnMemoryAllocationChanged( - const WebKit::WebGraphicsMemoryAllocation& allocation); private: + void InitializeCapabilities(); + base::ThreadChecker main_thread_checker_; base::ThreadChecker context_thread_checker_; @@ -68,8 +65,6 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess scoped_ptr<webkit::gpu::GrContextForWebGraphicsContext3D> gr_context_; LostContextCallback lost_context_callback_; - SwapBuffersCompleteCallback swap_buffers_complete_callback_; - MemoryPolicyChangedCallback memory_policy_changed_callback_; base::Lock destroyed_lock_; bool destroyed_; @@ -78,12 +73,9 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess class LostContextCallbackProxy; scoped_ptr<LostContextCallbackProxy> lost_context_callback_proxy_; - class SwapBuffersCompleteCallbackProxy; - scoped_ptr<SwapBuffersCompleteCallbackProxy> - swap_buffers_complete_callback_proxy_; + cc::ContextProvider::Capabilities capabilities_; - class MemoryAllocationCallbackProxy; - scoped_ptr<MemoryAllocationCallbackProxy> memory_allocation_callback_proxy_; + DISALLOW_COPY_AND_ASSIGN(ContextProviderInProcess); }; } // namespace gpu |