diff options
| author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-15 21:54:02 +0000 |
|---|---|---|
| committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-15 21:54:02 +0000 |
| commit | dc57aa98952ada0bb911c05a2f7d6efb1fd14007 (patch) | |
| tree | bc34aa4d460a1720ad2cb4d0ad297c84152bfc9f /gpu/command_buffer | |
| parent | 8cb1442cc3b16a67c515bb3d1076d7eba4749b98 (diff) | |
| download | chromium_src-dc57aa98952ada0bb911c05a2f7d6efb1fd14007.zip chromium_src-dc57aa98952ada0bb911c05a2f7d6efb1fd14007.tar.gz chromium_src-dc57aa98952ada0bb911c05a2f7d6efb1fd14007.tar.bz2 | |
Committing on behalf of p155off@gmail.com .
Remove duplicated code in AcceleratedSurface using PbufferGLContext instead.
This also fixes a crash caused by the OpenGL bindings not being initialized.
BUG=46286
TEST=flash plugin 10.1 works again in both mac 10.5 and 10.6
Review URL: http://codereview.chromium.org/2782006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49836 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer')
| -rw-r--r-- | gpu/command_buffer/service/gpu_processor_mac.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gpu/command_buffer/service/gpu_processor_mac.cc b/gpu/command_buffer/service/gpu_processor_mac.cc index 8191cef..52fda60 100644 --- a/gpu/command_buffer/service/gpu_processor_mac.cc +++ b/gpu/command_buffer/service/gpu_processor_mac.cc @@ -40,8 +40,7 @@ bool GPUProcessor::Initialize(gfx::PluginWindowHandle window, if (window) { surface_.reset(new AcceleratedSurface()); // TODO(apatrick): AcceleratedSurface will not work with an OSMesa context. - if (!surface_->Initialize( - static_cast<CGLContextObj>(context_->GetHandle()), false)) { + if (!surface_->Initialize(context_.get(), false)) { Destroy(); return false; } |