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 /webkit/tools/pepper_test_plugin | |
| 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 'webkit/tools/pepper_test_plugin')
| -rw-r--r-- | webkit/tools/pepper_test_plugin/plugin_object.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/pepper_test_plugin/plugin_object.cc b/webkit/tools/pepper_test_plugin/plugin_object.cc index 6e755ef..35c2a2c 100644 --- a/webkit/tools/pepper_test_plugin/plugin_object.cc +++ b/webkit/tools/pepper_test_plugin/plugin_object.cc @@ -422,7 +422,7 @@ void PluginObject::Initialize3D() { // Initialize the demo GL state. pglMakeCurrent(pgl_context_); GLFromCPPInit(); - pglMakeCurrent(PGL_NO_CONTEXT); + pglMakeCurrent(NULL); #endif // INDEPENDENT_PLUGIN } @@ -458,7 +458,7 @@ void PluginObject::Draw3D() { glViewport(0, 0, width_, height_); GLFromCPPDraw(); pglSwapBuffers(); - pglMakeCurrent(PGL_NO_CONTEXT); + pglMakeCurrent(NULL); // Async flushes just to see them working. context3d_.waitForProgress = true; |