diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-24 22:27:04 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-24 22:27:04 +0000 |
| commit | 8ceb44c74fc375df749b60acc6fc01b5327c6d18 (patch) | |
| tree | 0512ef018e445f45d142e8a79ed4a19b9390b6d3 /webkit/tools/pepper_test_plugin | |
| parent | c16b5958cc9a47992e6c24473258582773036af5 (diff) | |
| download | chromium_src-8ceb44c74fc375df749b60acc6fc01b5327c6d18.zip chromium_src-8ceb44c74fc375df749b60acc6fc01b5327c6d18.tar.gz chromium_src-8ceb44c74fc375df749b60acc6fc01b5327c6d18.tar.bz2 | |
I just put the code that does not compile on ARM. Trybots will fail because I had to remove these from the CL to make gcl upload properly accept it.
A + base\scoped_open_process.h
A + chrome\plugin\command_buffer_stub_win.cc
TEST=try
BUG=none
Review URL: http://codereview.chromium.org/661022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39937 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 35c2a2c..6e755ef 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(NULL); + pglMakeCurrent(PGL_NO_CONTEXT); #endif // INDEPENDENT_PLUGIN } @@ -458,7 +458,7 @@ void PluginObject::Draw3D() { glViewport(0, 0, width_, height_); GLFromCPPDraw(); pglSwapBuffers(); - pglMakeCurrent(NULL); + pglMakeCurrent(PGL_NO_CONTEXT); // Async flushes just to see them working. context3d_.waitForProgress = true; |