diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-10 07:01:59 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-10 07:01:59 +0000 |
| commit | d9a54602add9699ec4d5ebd1630c5c0c580ce8e8 (patch) | |
| tree | 233319a1797c5e7dde1f080b65f876baf1869501 /webkit/common/gpu/context_provider_in_process.h | |
| parent | 5291380cf9274160c02d805b7425bacbcfb2a4f5 (diff) | |
| download | chromium_src-d9a54602add9699ec4d5ebd1630c5c0c580ce8e8.zip chromium_src-d9a54602add9699ec4d5ebd1630c5c0c580ce8e8.tar.gz chromium_src-d9a54602add9699ec4d5ebd1630c5c0c580ce8e8.tar.bz2 | |
Pipe SwapBuffers call{,backs} through ContextSupport
This plumbs the SwapBuffers calls and callbacks through the
gpu::ContextSupport interface instead of WGC3D. There are two production
paths for the callbacks - using Echo and using View IPCs. The former is
used everywhere except for single-threaded mac and guest plugin mode.
This implements the Echo path directly in GLES2Implementation and leaves
the implementation of the non-Echo path in WGC3DCommandBufferImpl. We'll
still have to clean that up to avoid having to allocate a WGC3D, but this
at least gets rid of the API dependencies from cc.
R=piman
BUG=181120
Review URL: https://codereview.chromium.org/59233007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239685 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/common/gpu/context_provider_in_process.h')
| -rw-r--r-- | webkit/common/gpu/context_provider_in_process.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/webkit/common/gpu/context_provider_in_process.h b/webkit/common/gpu/context_provider_in_process.h index 91cdc58..72098b2 100644 --- a/webkit/common/gpu/context_provider_in_process.h +++ b/webkit/common/gpu/context_provider_in_process.h @@ -42,9 +42,6 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess 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; @@ -56,7 +53,6 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess virtual ~ContextProviderInProcess(); void OnLostContext(); - void OnSwapBuffersComplete(); private: void InitializeCapabilities(); @@ -69,7 +65,6 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess scoped_ptr<webkit::gpu::GrContextForWebGraphicsContext3D> gr_context_; LostContextCallback lost_context_callback_; - SwapBuffersCompleteCallback swap_buffers_complete_callback_; base::Lock destroyed_lock_; bool destroyed_; @@ -78,10 +73,6 @@ 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_; DISALLOW_COPY_AND_ASSIGN(ContextProviderInProcess); |