Changeset 83957 in webkit

Timestamp:

Apr 15, 2011 12:55:47 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-15 Ben Taylor <​bentaylor.solx86@gmail.com>

Reviewed by Alexey Proskuryakov.

Fix building with Sun Studio 12: function pointers for extern "C" are treated differently
​https://bugs.webkit.org/show_bug.cgi?id=58508

Since extern "C" makes a different type (although most compilers ignore that),
we should be more careful when passing NPAPI callback functions.

• plugins/npapi.cpp: (NPN_PluginThreadAsyncCall):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/npapi.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-15  Ben Taylor  <bentaylor.solx86@gmail.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Fix building with Sun Studio 12: function pointers for extern "C" are treated differently
+        https://bugs.webkit.org/show_bug.cgi?id=58508
+
+        Since extern "C" makes a different type (although most compilers ignore that),
+        we should be more careful when passing NPAPI callback functions.
+
+        * plugins/npapi.cpp:
+        (NPN_PluginThreadAsyncCall):
+
 2011-04-15  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/plugins/npapi.cpp

@@ -172 +172 @@
 }
 
-void NPN_PluginThreadAsyncCall(NPP instance, void (*func) (void *), void *userData)
+extern "C" typedef void PluginThreadAsyncCallFunction(void*);
+void NPN_PluginThreadAsyncCall(NPP instance, PluginThreadAsyncCallFunction func, void* userData)
 {
-    PluginMainThreadScheduler::scheduler().scheduleCall(instance, func, userData);
+    // Callback function type only differs from MainThreadFunction by being extern "C", which doesn't affect calling convention on any compilers we use.
+    PluginMainThreadScheduler::scheduler().scheduleCall(instance, reinterpret_cast<PluginMainThreadScheduler::MainThreadFunction*>(func), userData);
 }