diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-20 01:20:47 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-20 01:20:47 +0000 |
| commit | 024e9386c24b862cae3a4cf4bd22fd4651b02cc5 (patch) | |
| tree | 12f9a2c80e2a142856c1adefc3253f66a491f0bb /gpu/pgl | |
| parent | 9cf005d236d090fb18d8a5b6c6c630a94e893ef4 (diff) | |
| download | chromium_src-024e9386c24b862cae3a4cf4bd22fd4651b02cc5.zip chromium_src-024e9386c24b862cae3a4cf4bd22fd4651b02cc5.tar.gz chromium_src-024e9386c24b862cae3a4cf4bd22fd4651b02cc5.tar.bz2 | |
Revert 39530 - GPU plugin forwards repaint events to Pepper plugin.
WM_PAINT results in a call to Pepper repaint callback.
Implemented WM_ERASEBKGND to prevent flickering on repaint.
Implemented PGL_NO_CONTEXT (copied from EGL spec). This is already reviewed by alokp but unfortunately got entangled with this CL.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/571018
TBR=alokp@chromium.org
Review URL: http://codereview.chromium.org/650100
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/pgl')
| -rw-r--r-- | gpu/pgl/pgl.cc | 2 | ||||
| -rw-r--r-- | gpu/pgl/pgl.h | 16 |
2 files changed, 8 insertions, 10 deletions
diff --git a/gpu/pgl/pgl.cc b/gpu/pgl/pgl.cc index 59c2635..d357fe2 100644 --- a/gpu/pgl/pgl.cc +++ b/gpu/pgl/pgl.cc @@ -223,7 +223,7 @@ PGLBoolean pglDestroyContext(PGLContext pgl_context) { return PGL_FALSE; if (pgl_context == pglGetCurrentContext()) - pglMakeCurrent(PGL_NO_CONTEXT); + pglMakeCurrent(NULL); delete static_cast<PGLContextImpl*>(pgl_context); return PGL_TRUE; diff --git a/gpu/pgl/pgl.h b/gpu/pgl/pgl.h index 118d6fe..ac67ec1 100644 --- a/gpu/pgl/pgl.h +++ b/gpu/pgl/pgl.h @@ -8,10 +8,8 @@ #include "npapi.h" #include "npapi_extensions.h" -#define PGL_TRUE 1 -#define PGL_FALSE 0 - -#define PGL_NO_CONTEXT ((PGLContext) 0) +#define PGL_TRUE 1 +#define PGL_FALSE 0 #ifdef __cplusplus extern "C" { @@ -23,11 +21,11 @@ typedef int32 PGLInt; // These are the same error codes as used by EGL. enum { - PGL_SUCCESS = 0x3000, - PGL_NOT_INITIALIZED = 0x3001, - PGL_BAD_CONTEXT = 0x3006, - PGL_BAD_PARAMETER = 0x300C, - PGL_CONTEXT_LOST = 0x300E + PGL_SUCCESS = 0x3000, + PGL_NOT_INITIALIZED = 0x3001, + PGL_BAD_CONTEXT = 0x3006, + PGL_BAD_PARAMETER = 0x300C, + PGL_CONTEXT_LOST = 0x300E }; // Initialize the PGL library. This must have completed before any other PGL |