summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorpilgrim <pilgrim@chromium.org>2014-09-29 22:00:58 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-30 05:01:21 +0000
commit7db0709dc9a1622c95c42ff349561da528e905b2 (patch)
tree29784107943d9ff739146b5a3384975257f4bda5 /webkit
parent1a815bc356ca4e4e387870b2cd953030ae6647ba (diff)
downloadchromium_src-7db0709dc9a1622c95c42ff349561da528e905b2.zip
chromium_src-7db0709dc9a1622c95c42ff349561da528e905b2.tar.gz
chromium_src-7db0709dc9a1622c95c42ff349561da528e905b2.tar.bz2
Move InitializeOnCurrentThread down from WebGraphicsContext3DImpl to WebGraphicsContext3DCommandBufferImpl and WebGraphicsContext3DInProcessCommandBufferImpl
in preparation for dis-inheriting these classes BUG=338338 TBR=darin@chromium.org Review URL: https://codereview.chromium.org/609973002 Cr-Commit-Position: refs/heads/master@{#297362}
Diffstat (limited to 'webkit')
-rw-r--r--webkit/common/gpu/webgraphicscontext3d_impl.h5
-rw-r--r--webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h3
2 files changed, 1 insertions, 7 deletions
diff --git a/webkit/common/gpu/webgraphicscontext3d_impl.h b/webkit/common/gpu/webgraphicscontext3d_impl.h
index 9097b8f..64bf552 100644
--- a/webkit/common/gpu/webgraphicscontext3d_impl.h
+++ b/webkit/common/gpu/webgraphicscontext3d_impl.h
@@ -48,11 +48,6 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DImpl
public:
virtual ~WebGraphicsContext3DImpl();
- // Must be called before any of the following methods. Permanently binds to
- // the first calling thread. Returns false if the graphics context fails to
- // initialize. Do not call from more than one thread.
- virtual bool InitializeOnCurrentThread() = 0;
-
//----------------------------------------------------------------------
// WebGraphicsContext3D methods
diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
index 62197fd..7e503a5 100644
--- a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
+++ b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
@@ -60,8 +60,7 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl
size_t GetMappedMemoryLimit();
- // WebGraphicsContext3DImpl methods
- virtual bool InitializeOnCurrentThread() OVERRIDE;
+ bool InitializeOnCurrentThread();
//----------------------------------------------------------------------
// WebGraphicsContext3D methods