Show
Ignore:
Timestamp:
08/08/08 14:23:27 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35637

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/WebCore/plugins/qt/PluginViewQt.cpp

    r427 r433  
    343343            return NPERR_GENERIC_ERROR; 
    344344 
    345         NPObject* windowScriptObject = m_parentFrame->windowScriptNPObject(); 
     345        NPObject* windowScriptObject = m_parentFrame->script()->windowScriptNPObject(); 
    346346 
    347347        // Return value is expected to be retained, as described here: <http://www.mozilla.org/projects/plugin/npruntime.html> 
    …… 
    410410    freeStringArray(m_paramValues, m_paramCount); 
    411411 
    412     m_parentFrame->cleanupScriptObjectsForPlugin(this); 
     412    m_parentFrame->script()->cleanupScriptObjectsForPlugin(this); 
    413413 
    414414    if (m_plugin && !(m_plugin->quirks().contains(PluginQuirkDontUnloadPlugin)))