diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 18:11:18 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 18:11:18 +0000 |
| commit | b3244ee0593eb76ff01b9a5112a5572b5b4602e0 (patch) | |
| tree | 5045a5941476d9ca717cf39ba8bc834ed52eb791 /webkit/gpu | |
| parent | 27d9110c3f42fddec09fc2621353a6757c1b31a7 (diff) | |
| download | chromium_src-b3244ee0593eb76ff01b9a5112a5572b5b4602e0.zip chromium_src-b3244ee0593eb76ff01b9a5112a5572b5b4602e0.tar.gz chromium_src-b3244ee0593eb76ff01b9a5112a5572b5b4602e0.tar.bz2 | |
Revert "Revert 130384 - Broke a few Mac bots"
This reverts commit 7bfa1cab6da66e6923316515eaf465afb65e5481.
BUG=120297
TEST=run browser_tests on linux
TBR=apatrick@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9959107
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130681 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/gpu')
| -rw-r--r-- | webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc | 2 |
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 8ad9cc1..c64e861 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(), - NULL, + context_group ? context_group->GetImplementation()->share_group() : NULL, transfer_buffer_.get(), true, false)); |