Changeset 106503 in webkit


Ignore:
Timestamp:
Feb 1, 2012 3:11:01 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

GetMIMEDescription should return const char *
https://bugs.webkit.org/show_bug.cgi?id=77297

Patch by John Yani <vanuan@gmail.com> 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):

Location:
trunk/Source/WebCore
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r106501 r106503  
     12012-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
    1202012-02-01  Timothy Hatcher  <timothy@apple.com>
    221
  • trunk/Source/WebCore/plugins/blackberry/PluginPackageBlackBerry.cpp

    r101331 r106503  
    8080    m_loadCount--;
    8181
    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");
    8483    NPP_GetValueProcPtr getValue = (NPP_GetValueProcPtr) dlsym(m_module, "NP_GetValue");
    8584
  • trunk/Source/WebCore/plugins/efl/PluginPackageEfl.cpp

    r103544 r106503  
    4444namespace WebCore {
    4545
    46 typedef char* (*NPP_GetMIMEDescriptionProcPtr)();
    47 
    4846bool PluginPackage::fetchInfo()
    4947{
     
    5452
    5553    NPP_GetValueProcPtr getValue = 0;
    56     NPP_GetMIMEDescriptionProcPtr getMIMEDescription = 0;
     54    NP_GetMIMEDescriptionFuncPtr getMIMEDescription = 0;
    5755
    5856    getValue = reinterpret_cast<NPP_GetValueProcPtr>(dlsym(m_module, "NP_GetValue"));
     
    6260    }
    6361
    64     getMIMEDescription = reinterpret_cast<NPP_GetMIMEDescriptionProcPtr>(dlsym(m_module, "NP_GetMIMEDescription"));
     62    getMIMEDescription = reinterpret_cast<NP_GetMIMEDescriptionFuncPtr>(dlsym(m_module, "NP_GetMIMEDescription"));
    6563    if ((errmsg = dlerror())) {
    6664        EINA_LOG_ERR("Could not get symbol NP_GetMIMEDescription: %s", errmsg);
  • trunk/Source/WebCore/plugins/npapi.h

    r98403 r106503  
    792792
    793793#if defined(XP_UNIX)
    794 char* NPP_GetMIMEDescription(void);
     794const char* NPP_GetMIMEDescription(void);
    795795#endif
    796796
  • trunk/Source/WebCore/plugins/npfunctions.h

    r78604 r106503  
    212212#if defined(XP_UNIX)
    213213typedef EXPORTED_CALLBACK(NPError, NP_InitializeFuncPtr)(NPNetscapeFuncs*, NPPluginFuncs*);
    214 typedef EXPORTED_CALLBACK(char*, NP_GetMIMEDescriptionFuncPtr)(void);
     214typedef EXPORTED_CALLBACK(const char*, NP_GetMIMEDescriptionFuncPtr)(void);
    215215#else
    216216typedef EXPORTED_CALLBACK(NPError, NP_InitializeFuncPtr)(NPNetscapeFuncs*);
  • trunk/Source/WebCore/plugins/qt/PluginPackageQt.cpp

    r95901 r106503  
    4242
    4343    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");
    4746    if (!gm || !gv)
    4847        return false;
Note: See TracChangeset for help on using the changeset viewer.