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 /app/gfx | |
| 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 'app/gfx')
| -rw-r--r-- | app/gfx/gl/gl_context.h | 2 | ||||
| -rw-r--r-- | app/gfx/gl/gl_context_mac.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/gfx/gl/gl_context.h b/app/gfx/gl/gl_context.h index 1b04985..9da7583 100644 --- a/app/gfx/gl/gl_context.h +++ b/app/gfx/gl/gl_context.h @@ -48,6 +48,8 @@ class GLContext { // Create a GL context used for offscreen rendering. It is initially backed by // a 1x1 pbuffer. Use it to create an FBO to do useful rendering. + // |share_context|, if non-NULL, is a context which the internally created + // OpenGL context shares textures and other resources. static GLContext* CreateOffscreenGLContext(GLContext* shared_context); protected: diff --git a/app/gfx/gl/gl_context_mac.cc b/app/gfx/gl/gl_context_mac.cc index e69f644..7d5bc39 100644 --- a/app/gfx/gl/gl_context_mac.cc +++ b/app/gfx/gl/gl_context_mac.cc @@ -6,7 +6,6 @@ #include <OpenGL/OpenGL.h> -#include "app/surface/accelerated_surface_mac.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "app/gfx/gl/gl_bindings.h" |