summaryrefslogtreecommitdiffstats
path: root/webkit/gpu
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-03 18:21:31 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-03 18:21:31 +0000
commit7bfa1cab6da66e6923316515eaf465afb65e5481 (patch)
tree180c4dceb0f37389185511fb73072d4ae881a509 /webkit/gpu
parent5766e6b1f4b891b059512864b99187c5cbbde59b (diff)
downloadchromium_src-7bfa1cab6da66e6923316515eaf465afb65e5481.zip
chromium_src-7bfa1cab6da66e6923316515eaf465afb65e5481.tar.gz
chromium_src-7bfa1cab6da66e6923316515eaf465afb65e5481.tar.bz2
Revert 130384 - Broke a few Mac bots
Revert "Revert "Make ShareGroup thread safe" http://crrev.com/130034." TEST=run DRT in debug on linux BUG=120297 TBR=apatrick@chromium.org Review URL: http://codereview.chromium.org/9958087 TBR=gman@chromium.org Review URL: https://chromiumcodereview.appspot.com/9969115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130413 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/gpu')
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
index c64e861..8ad9cc1 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
@@ -462,7 +462,7 @@ bool GLInProcessContext::Initialize(const gfx::Size& size,
// Create the object exposing the OpenGL API.
gles2_implementation_.reset(new GLES2Implementation(
gles2_helper_.get(),
- context_group ? context_group->GetImplementation()->share_group() : NULL,
+ NULL,
transfer_buffer_.get(),
true,
false));