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

Side by Side Diff: webkit/tools/pepper_test_plugin/main.cc

Issue 367002: Added Pepper 3D render context that instantiates the GPU plugin.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 12 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc. ("Ap ple") in 2 IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc. ("Ap ple") in
3 consideration of your agreement to the following terms, and your use, installat ion, 3 consideration of your agreement to the following terms, and your use, installat ion,
4 modification or redistribution of this Apple software constitutes acceptance of these 4 modification or redistribution of this Apple software constitutes acceptance of these
5 terms. If you do not agree with these terms, please do not use, install, modif y or 5 terms. If you do not agree with these terms, please do not use, install, modif y or
6 redistribute this Apple software. 6 redistribute this Apple software.
7 7
8 In consideration of your agreement to abide by the following terms, and subject to these 8 In consideration of your agreement to abide by the following terms, and subject to these
9 terms, Apple grants you a personal, non-exclusive license, under Apple’s copyri ghts in 9 terms, Apple grants you a personal, non-exclusive license, under Apple’s copyri ghts in
10 this original Apple software (the "Apple Software"), to use, reproduce, modify and 10 this original Apple software (the "Apple Software"), to use, reproduce, modify and
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 NPError NPP_New(NPMIMEType pluginType, 164 NPError NPP_New(NPMIMEType pluginType,
165 NPP instance, 165 NPP instance,
166 uint16 mode, 166 uint16 mode,
167 int16 argc, char* argn[], char* argv[], 167 int16 argc, char* argn[], char* argv[],
168 NPSavedData* saved) { 168 NPSavedData* saved) {
169 if (browser->version >= 14) { 169 if (browser->version >= 14) {
170 PluginObject* obj = reinterpret_cast<PluginObject*>( 170 PluginObject* obj = reinterpret_cast<PluginObject*>(
171 browser->createobject(instance, PluginObject::GetPluginClass())); 171 browser->createobject(instance, PluginObject::GetPluginClass()));
172 instance->pdata = obj; 172 instance->pdata = obj;
173 event_handler = new EventHandler(instance); 173 event_handler = new EventHandler(instance);
174
175 obj->New(pluginType, argc, argn, argv);
174 } 176 }
175 177
176 return NPERR_NO_ERROR; 178 return NPERR_NO_ERROR;
177 } 179 }
178 180
179 NPError NPP_Destroy(NPP instance, NPSavedData** save) { 181 NPError NPP_Destroy(NPP instance, NPSavedData** save) {
180 PluginObject* obj = static_cast<PluginObject*>(instance->pdata); 182 PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
181 if (obj) 183 if (obj)
182 browser->releaseobject(obj->header()); 184 browser->releaseobject(obj->header());
183 185
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 272
271 #if defined(OS_LINUX) 273 #if defined(OS_LINUX)
272 NPError NP_GetValue(NPP instance, NPPVariable variable, void* value) { 274 NPError NP_GetValue(NPP instance, NPPVariable variable, void* value) {
273 return NPP_GetValue(instance, variable, value); 275 return NPP_GetValue(instance, variable, value);
274 } 276 }
275 277
276 const char* NP_GetMIMEDescription() { 278 const char* NP_GetMIMEDescription() {
277 return "pepper-application/x-pepper-test-plugin pepper test;"; 279 return "pepper-application/x-pepper-test-plugin pepper test;";
278 } 280 }
279 #endif 281 #endif
OLDNEW
« no previous file with comments | « webkit/tools/pepper_test_plugin/command_buffer_pepper.cc ('k') | webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698