Changeset 106503 in webkit
- Timestamp:
- Feb 1, 2012 3:11:01 PM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r106501 r106503 1 2012-02-01 John Yani <vanuan@gmail.com> 2 3 GetMIMEDescription should return const char * 4 https://bugs.webkit.org/show_bug.cgi?id=77297 5 6 Reviewed by Alexey Proskuryakov. 7 8 No new tests. No change in behaviour. 9 10 * plugins/blackberry/PluginPackageBlackBerry.cpp: 11 (WebCore::PluginPackage::fetchInfo): 12 * plugins/efl/PluginPackageEfl.cpp: 13 (WebCore): 14 (WebCore::PluginPackage::fetchInfo): 15 * plugins/npapi.h: 16 * plugins/npfunctions.h: 17 * plugins/qt/PluginPackageQt.cpp: 18 (WebCore::PluginPackage::fetchInfo): 19 1 20 2012-02-01 Timothy Hatcher <timothy@apple.com> 2 21 -
trunk/Source/WebCore/plugins/blackberry/PluginPackageBlackBerry.cpp
r101331 r106503 80 80 m_loadCount--; 81 81 82 typedef char *(*NPP_GetMIMEDescriptionProcPtr)(); 83 NPP_GetMIMEDescriptionProcPtr getDescription = (NPP_GetMIMEDescriptionProcPtr) dlsym(m_module, "NP_GetMIMEDescription"); 82 NP_GetMIMEDescriptionFuncPtr getDescription = (NP_GetMIMEDescriptionFuncPtr) dlsym(m_module, "NP_GetMIMEDescription"); 84 83 NPP_GetValueProcPtr getValue = (NPP_GetValueProcPtr) dlsym(m_module, "NP_GetValue"); 85 84 -
trunk/Source/WebCore/plugins/efl/PluginPackageEfl.cpp
r103544 r106503 44 44 namespace WebCore { 45 45 46 typedef char* (*NPP_GetMIMEDescriptionProcPtr)();47 48 46 bool PluginPackage::fetchInfo() 49 47 { … … 54 52 55 53 NPP_GetValueProcPtr getValue = 0; 56 NP P_GetMIMEDescriptionProcPtr getMIMEDescription = 0;54 NP_GetMIMEDescriptionFuncPtr getMIMEDescription = 0; 57 55 58 56 getValue = reinterpret_cast<NPP_GetValueProcPtr>(dlsym(m_module, "NP_GetValue")); … … 62 60 } 63 61 64 getMIMEDescription = reinterpret_cast<NP P_GetMIMEDescriptionProcPtr>(dlsym(m_module, "NP_GetMIMEDescription"));62 getMIMEDescription = reinterpret_cast<NP_GetMIMEDescriptionFuncPtr>(dlsym(m_module, "NP_GetMIMEDescription")); 65 63 if ((errmsg = dlerror())) { 66 64 EINA_LOG_ERR("Could not get symbol NP_GetMIMEDescription: %s", errmsg); -
trunk/Source/WebCore/plugins/npapi.h
r98403 r106503 792 792 793 793 #if defined(XP_UNIX) 794 c har* NPP_GetMIMEDescription(void);794 const char* NPP_GetMIMEDescription(void); 795 795 #endif 796 796 -
trunk/Source/WebCore/plugins/npfunctions.h
r78604 r106503 212 212 #if defined(XP_UNIX) 213 213 typedef EXPORTED_CALLBACK(NPError, NP_InitializeFuncPtr)(NPNetscapeFuncs*, NPPluginFuncs*); 214 typedef EXPORTED_CALLBACK(c har*, NP_GetMIMEDescriptionFuncPtr)(void);214 typedef EXPORTED_CALLBACK(const char*, NP_GetMIMEDescriptionFuncPtr)(void); 215 215 #else 216 216 typedef EXPORTED_CALLBACK(NPError, NP_InitializeFuncPtr)(NPNetscapeFuncs*); -
trunk/Source/WebCore/plugins/qt/PluginPackageQt.cpp
r95901 r106503 42 42 43 43 NPP_GetValueProcPtr gv = (NPP_GetValueProcPtr)m_module->resolve("NP_GetValue"); 44 typedef char *(*NPP_GetMIMEDescriptionProcPtr)(); 45 NPP_GetMIMEDescriptionProcPtr gm = 46 (NPP_GetMIMEDescriptionProcPtr)m_module->resolve("NP_GetMIMEDescription"); 44 NP_GetMIMEDescriptionFuncPtr gm = 45 (NP_GetMIMEDescriptionFuncPtr)m_module->resolve("NP_GetMIMEDescription"); 47 46 if (!gm || !gv) 48 47 return false;
Note: See TracChangeset
for help on using the changeset viewer.