Title: [106503] trunk/Source/WebCore
- Revision
- 106503
- Author
- [email protected]
- Date
- 2012-02-01 15:11:01 -0800 (Wed, 01 Feb 2012)
Log Message
GetMIMEDescription should return const char *
https://bugs.webkit.org/show_bug.cgi?id=77297
Patch by John Yani <[email protected]> on 2012-02-01
Reviewed by Alexey Proskuryakov.
No new tests. No change in behaviour.
* plugins/blackberry/PluginPackageBlackBerry.cpp:
(WebCore::PluginPackage::fetchInfo):
* plugins/efl/PluginPackageEfl.cpp:
(WebCore):
(WebCore::PluginPackage::fetchInfo):
* plugins/npapi.h:
* plugins/npfunctions.h:
* plugins/qt/PluginPackageQt.cpp:
(WebCore::PluginPackage::fetchInfo):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (106502 => 106503)
--- trunk/Source/WebCore/ChangeLog 2012-02-01 23:08:54 UTC (rev 106502)
+++ trunk/Source/WebCore/ChangeLog 2012-02-01 23:11:01 UTC (rev 106503)
@@ -1,3 +1,22 @@
+2012-02-01 John Yani <[email protected]>
+
+ GetMIMEDescription should return const char *
+ https://bugs.webkit.org/show_bug.cgi?id=77297
+
+ Reviewed by Alexey Proskuryakov.
+
+ No new tests. No change in behaviour.
+
+ * plugins/blackberry/PluginPackageBlackBerry.cpp:
+ (WebCore::PluginPackage::fetchInfo):
+ * plugins/efl/PluginPackageEfl.cpp:
+ (WebCore):
+ (WebCore::PluginPackage::fetchInfo):
+ * plugins/npapi.h:
+ * plugins/npfunctions.h:
+ * plugins/qt/PluginPackageQt.cpp:
+ (WebCore::PluginPackage::fetchInfo):
+
2012-02-01 Timothy Hatcher <[email protected]>
Consolidate duplicate "willHide" functions in DetailedHeapshotView.js to fix
Modified: trunk/Source/WebCore/plugins/blackberry/PluginPackageBlackBerry.cpp (106502 => 106503)
--- trunk/Source/WebCore/plugins/blackberry/PluginPackageBlackBerry.cpp 2012-02-01 23:08:54 UTC (rev 106502)
+++ trunk/Source/WebCore/plugins/blackberry/PluginPackageBlackBerry.cpp 2012-02-01 23:11:01 UTC (rev 106503)
@@ -79,8 +79,7 @@
// We are fetching the info. Technically we have not loaded the plugin. PluginView::Init will load the plugin so decrement the counter
m_loadCount--;
- typedef char *(*NPP_GetMIMEDescriptionProcPtr)();
- NPP_GetMIMEDescriptionProcPtr getDescription = (NPP_GetMIMEDescriptionProcPtr) dlsym(m_module, "NP_GetMIMEDescription");
+ NP_GetMIMEDescriptionFuncPtr getDescription = (NP_GetMIMEDescriptionFuncPtr) dlsym(m_module, "NP_GetMIMEDescription");
NPP_GetValueProcPtr getValue = (NPP_GetValueProcPtr) dlsym(m_module, "NP_GetValue");
if (!getDescription || !getValue)
Modified: trunk/Source/WebCore/plugins/efl/PluginPackageEfl.cpp (106502 => 106503)
--- trunk/Source/WebCore/plugins/efl/PluginPackageEfl.cpp 2012-02-01 23:08:54 UTC (rev 106502)
+++ trunk/Source/WebCore/plugins/efl/PluginPackageEfl.cpp 2012-02-01 23:11:01 UTC (rev 106503)
@@ -43,8 +43,6 @@
namespace WebCore {
-typedef char* (*NPP_GetMIMEDescriptionProcPtr)();
-
bool PluginPackage::fetchInfo()
{
const char *errmsg;
@@ -53,7 +51,7 @@
return false;
NPP_GetValueProcPtr getValue = 0;
- NPP_GetMIMEDescriptionProcPtr getMIMEDescription = 0;
+ NP_GetMIMEDescriptionFuncPtr getMIMEDescription = 0;
getValue = reinterpret_cast<NPP_GetValueProcPtr>(dlsym(m_module, "NP_GetValue"));
if ((errmsg = dlerror())) {
@@ -61,7 +59,7 @@
return false;
}
- getMIMEDescription = reinterpret_cast<NPP_GetMIMEDescriptionProcPtr>(dlsym(m_module, "NP_GetMIMEDescription"));
+ getMIMEDescription = reinterpret_cast<NP_GetMIMEDescriptionFuncPtr>(dlsym(m_module, "NP_GetMIMEDescription"));
if ((errmsg = dlerror())) {
EINA_LOG_ERR("Could not get symbol NP_GetMIMEDescription: %s", errmsg);
return false;
Modified: trunk/Source/WebCore/plugins/npapi.h (106502 => 106503)
--- trunk/Source/WebCore/plugins/npapi.h 2012-02-01 23:08:54 UTC (rev 106502)
+++ trunk/Source/WebCore/plugins/npapi.h 2012-02-01 23:11:01 UTC (rev 106503)
@@ -791,7 +791,7 @@
/* NPP_* functions are provided by the plugin and called by the navigator. */
#if defined(XP_UNIX)
-char* NPP_GetMIMEDescription(void);
+const char* NPP_GetMIMEDescription(void);
#endif
NPError NP_LOADDS NPP_Initialize(void);
Modified: trunk/Source/WebCore/plugins/npfunctions.h (106502 => 106503)
--- trunk/Source/WebCore/plugins/npfunctions.h 2012-02-01 23:08:54 UTC (rev 106502)
+++ trunk/Source/WebCore/plugins/npfunctions.h 2012-02-01 23:11:01 UTC (rev 106503)
@@ -211,7 +211,7 @@
#if defined(XP_UNIX)
typedef EXPORTED_CALLBACK(NPError, NP_InitializeFuncPtr)(NPNetscapeFuncs*, NPPluginFuncs*);
-typedef EXPORTED_CALLBACK(char*, NP_GetMIMEDescriptionFuncPtr)(void);
+typedef EXPORTED_CALLBACK(const char*, NP_GetMIMEDescriptionFuncPtr)(void);
#else
typedef EXPORTED_CALLBACK(NPError, NP_InitializeFuncPtr)(NPNetscapeFuncs*);
#endif
Modified: trunk/Source/WebCore/plugins/qt/PluginPackageQt.cpp (106502 => 106503)
--- trunk/Source/WebCore/plugins/qt/PluginPackageQt.cpp 2012-02-01 23:08:54 UTC (rev 106502)
+++ trunk/Source/WebCore/plugins/qt/PluginPackageQt.cpp 2012-02-01 23:11:01 UTC (rev 106503)
@@ -41,9 +41,8 @@
return false;
NPP_GetValueProcPtr gv = (NPP_GetValueProcPtr)m_module->resolve("NP_GetValue");
- typedef char *(*NPP_GetMIMEDescriptionProcPtr)();
- NPP_GetMIMEDescriptionProcPtr gm =
- (NPP_GetMIMEDescriptionProcPtr)m_module->resolve("NP_GetMIMEDescription");
+ NP_GetMIMEDescriptionFuncPtr gm =
+ (NP_GetMIMEDescriptionFuncPtr)m_module->resolve("NP_GetMIMEDescription");
if (!gm || !gv)
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
