| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2009, Google Inc. | 2 * Copyright 2009, Google Inc. |
| 3 * All rights reserved. | 3 * All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 #include "plugin/cross/o3d_glue.h" | 52 #include "plugin/cross/o3d_glue.h" |
| 53 #include "plugin/cross/config.h" | 53 #include "plugin/cross/config.h" |
| 54 #include "plugin/cross/stream_manager.h" | 54 #include "plugin/cross/stream_manager.h" |
| 55 #include "third_party/nixysa/static_glue/npapi/common.h" | 55 #include "third_party/nixysa/static_glue/npapi/common.h" |
| 56 #include "third_party/nixysa/static_glue/npapi/npn_api.h" | 56 #include "third_party/nixysa/static_glue/npapi/npn_api.h" |
| 57 | 57 |
| 58 #if defined(O3D_INTERNAL_PLUGIN) | 58 #if defined(O3D_INTERNAL_PLUGIN) |
| 59 #define HANDLE_CRASHES void(0) | 59 #define HANDLE_CRASHES void(0) |
| 60 #else // O3D_INTERNAL_PLUGIN | 60 #else // O3D_INTERNAL_PLUGIN |
| 61 | 61 |
| 62 #if defined(OS_LINUX) |
| 63 #define EXPORT_SYMBOL __attribute__((visibility ("default"))) |
| 64 #else |
| 65 #define EXPORT_SYMBOL |
| 66 #endif |
| 67 |
| 62 extern ExceptionManager *g_exception_manager; | 68 extern ExceptionManager *g_exception_manager; |
| 63 | 69 |
| 64 // BreakpadEnabler is a simple class to keep track of whether or not | 70 // BreakpadEnabler is a simple class to keep track of whether or not |
| 65 // we're executing code that we want to handle crashes for | 71 // we're executing code that we want to handle crashes for |
| 66 // (when the o3d plugin is running in Firefox, we don't want to handle | 72 // (when the o3d plugin is running in Firefox, we don't want to handle |
| 67 // crashes for the Flash plugin or Firefox, just the o3d code) | 73 // crashes for the Flash plugin or Firefox, just the o3d code) |
| 68 // Create a stack-based instance at the start of each function | 74 // Create a stack-based instance at the start of each function |
| 69 // where crash handling is desired. | 75 // where crash handling is desired. |
| 70 | 76 |
| 71 #define HANDLE_CRASHES BreakpadEnabler enabler | 77 #define HANDLE_CRASHES BreakpadEnabler enabler |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 | 140 |
| 135 void NPP_StreamAsFile(NPP instance, NPStream *stream, const char *fname); | 141 void NPP_StreamAsFile(NPP instance, NPStream *stream, const char *fname); |
| 136 | 142 |
| 137 void NPP_URLNotify(NPP instance, | 143 void NPP_URLNotify(NPP instance, |
| 138 const char *url, | 144 const char *url, |
| 139 NPReason reason, | 145 NPReason reason, |
| 140 void *notifyData); | 146 void *notifyData); |
| 141 }; // namespace o3d | 147 }; // namespace o3d |
| 142 | 148 |
| 143 #endif // O3D_PLUGIN_CROSS_MAIN_H_ | 149 #endif // O3D_PLUGIN_CROSS_MAIN_H_ |
| OLD | NEW |