Merge bug 468087
authorHonza Bambas <honzab@allpeers.com>
Thu, 15 Jan 2009 21:24:51 +0100
changeset 23762 52064976fe797d589baa9f3adafca6752c49ea3a
parent 23761 6e090de49b9c0cc9f700afe3c65d849d9e77e9b8 (current diff)
parent 23760 084a18e871f8441fae1bb7fd02250c19af06971c (diff)
child 23763 a9cd6dc8dbe0d9992e1b16ddd9a7070d0ad125bf
push id4711
push userhonzab.moz@firemni.cz
push dateThu, 15 Jan 2009 20:25:25 +0000
treeherdermozilla-central@52064976fe79 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs468087
milestone1.9.2a1pre
Merge bug 468087
--- a/modules/plugin/base/src/nsNPAPIPlugin.cpp
+++ b/modules/plugin/base/src/nsNPAPIPlugin.cpp
@@ -1665,17 +1665,17 @@ bool NP_CALLBACK
 
   NPPExceptionAutoHolder nppExceptionHolder;
   NPPAutoPusher nppPusher(npp);
 
   NPN_PLUGIN_LOG(PLUGIN_LOG_NOISY,
                  ("NPN_HasMethod(npp %p, npobj %p, property %p) called\n",
                   npp, npobj, methodName));
 
-  return npobj->_class->hasProperty(npobj, methodName);
+  return npobj->_class->hasMethod(npobj, methodName);
 }
 
 bool NP_CALLBACK
 _enumerate(NPP npp, NPObject *npobj, NPIdentifier **identifier,
            uint32_t *count)
 {
   if (!NS_IsMainThread()) {
     NPN_PLUGIN_LOG(PLUGIN_LOG_ALWAYS,("NPN_enumerate called from the wrong thread\n"));