Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(370)

Unified Diff: webkit/tools/pepper_test_plugin/main.cc

Issue 553050: Windows now uses the TLS API instead of __declspec(thread) for client side co... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« gpu/pgl/pgl.cc ('K') | « gpu/pgl/pgl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/pepper_test_plugin/main.cc
===================================================================
--- webkit/tools/pepper_test_plugin/main.cc (revision 37133)
+++ webkit/tools/pepper_test_plugin/main.cc (working copy)
@@ -34,6 +34,8 @@
#include <stdlib.h>
#include <stdio.h>
+#include "gpu/pgl/pgl.h"
+
#if defined(INDEPENDENT_PLUGIN)
#include <iostream>
#define LOG(x) std::cerr
@@ -118,6 +120,9 @@
EXPORT NPError API_CALL NP_GetEntryPoints(NPPluginFuncs* plugin_funcs);
EXPORT void API_CALL NP_Shutdown() {
+#if !defined(INDEPENDENT_PLUGIN)
+ pglTerminate();
+#endif
}
#if defined(OS_LINUX)
@@ -136,6 +141,9 @@
#endif
) {
browser = browser_funcs;
+#if !defined(INDEPENDENT_PLUGIN)
+ pglInitialize();
+#endif
#if defined(OS_LINUX)
return NP_GetEntryPoints(plugin_funcs);
#else
« gpu/pgl/pgl.cc ('K') | « gpu/pgl/pgl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698