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

Side by Side Diff: gpu/demos/framework/main_pepper.cc

Issue 1000001: Remove redundant nphostapi.h from webkit/glue/plugins, update source files as... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 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
« no previous file with comments | « no previous file | gpu/demos/framework/plugin.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/at_exit.h" 5 #include "base/at_exit.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "gpu/demos/framework/plugin.h" 7 #include "gpu/demos/framework/plugin.h"
8 #include "gpu/pgl/pgl.h" 8 #include "gpu/pgl/pgl.h"
9 #include "webkit/glue/plugins/nphostapi.h" 9 #include "third_party/npapi/bindings/nphostapi.h"
10 10
11 #if __GNUC__ >= 4 11 #if __GNUC__ >= 4
12 #define EXPORT __attribute__ ((visibility("default"))) 12 #define EXPORT __attribute__ ((visibility("default")))
13 #else 13 #else
14 // We use .def file to export symbols on OS_WIN. We could potentially use 14 // We use .def file to export symbols on OS_WIN. We could potentially use
15 // __declspec(dllexport) but API_CALL always adds something to the function 15 // __declspec(dllexport) but API_CALL always adds something to the function
16 // signature even inside extern "C" {} 16 // signature even inside extern "C" {}
17 #define EXPORT 17 #define EXPORT
18 #endif // GNUC 18 #endif // GNUC
19 19
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 EXPORT NPError API_CALL NP_GetValue(NPP instance, NPPVariable variable, 186 EXPORT NPError API_CALL NP_GetValue(NPP instance, NPPVariable variable,
187 void* value) { 187 void* value) {
188 return gpu::demos::NPP_GetValue(instance, variable, value); 188 return gpu::demos::NPP_GetValue(instance, variable, value);
189 } 189 }
190 190
191 EXPORT const char* API_CALL NP_GetMIMEDescription() { 191 EXPORT const char* API_CALL NP_GetMIMEDescription() {
192 return "pepper-application/x-gpu-demo::Pepper GPU Demo"; 192 return "pepper-application/x-gpu-demo::Pepper GPU Demo";
193 } 193 }
194 #endif // OS_LINUX 194 #endif // OS_LINUX
195 } // extern "C" 195 } // extern "C"
OLDNEW
« no previous file with comments | « no previous file | gpu/demos/framework/plugin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698