Changeset 49054 in webkit


Ignore:
Timestamp:
Oct 2, 2009 4:20:05 PM (14 years ago)
Author:
eric@webkit.org
Message:

2009-10-02 Jocelyn Turcotte <jocelyn.turcotte@nokia.com>

Reviewed by Tor Arne Vestbø.

[Qt] Add NPNVToolkit value quirk in plugins for nspluginwrapper.
Plugin error message was:
ERROR: failed to initialize brower-side RPC events listener
https://bugs.webkit.org/show_bug.cgi?id=25053

(WebCore::staticPluginQuirkRequiresGtkToolKit_NPN_GetValue):
(WebCore::PluginPackage::load):

Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r49053 r49054  
     12009-10-02  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
     2
     3        Reviewed by Tor Arne Vestbø.
     4
     5        [Qt] Add NPNVToolkit value quirk in plugins for nspluginwrapper.
     6        Plugin error message was:
     7        ERROR: failed to initialize brower-side RPC events listener
     8        https://bugs.webkit.org/show_bug.cgi?id=25053
     9
     10        (WebCore::staticPluginQuirkRequiresGtkToolKit_NPN_GetValue):
     11        (WebCore::PluginPackage::load):
     12
    1132009-10-02  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
    214
  • trunk/WebCore/plugins/qt/PluginPackageQt.cpp

    r48280 r49054  
    8181}
    8282
     83static NPError staticPluginQuirkRequiresGtkToolKit_NPN_GetValue(NPP instance, NPNVariable variable, void* value)
     84{
     85    if (variable == NPNVToolkit) {
     86        *static_cast<uint32*>(value) = 2;
     87        return NPERR_NO_ERROR;
     88    }
     89
     90    return NPN_GetValue(instance, variable, value);
     91}
     92
    8393bool PluginPackage::load()
    8494{
     
    112122    initializeBrowserFuncs();
    113123
     124    if (m_path.contains("npwrapper.")) {
     125        // nspluginwrapper relies on the toolkit value to know if glib is available
     126        // It does so in NP_Initialize with a null instance, therefore it is done this way:
     127        m_browserFuncs.getvalue = staticPluginQuirkRequiresGtkToolKit_NPN_GetValue;
     128    }
     129
    114130#if defined(XP_UNIX)
    115131    npErr = NP_Initialize(&m_browserFuncs, &m_pluginFuncs);
Note: See TracChangeset for help on using the changeset viewer.