From 8ceb44c74fc375df749b60acc6fc01b5327c6d18 Mon Sep 17 00:00:00 2001 From: "apatrick@chromium.org" Date: Wed, 24 Feb 2010 22:27:04 +0000 Subject: 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 --- webkit/tools/pepper_test_plugin/plugin_object.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'webkit') 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; -- cgit v1.1