Changeset 35599

Show
Ignore:
Timestamp:
08/06/08 05:35:28 (4 months ago)
Author:
jmalonzo@webkit.org
Message:

2008-08-06 Jan Michael Alonzo <jmalonzo@webkit.org>

Gtk build fix only

  • bindings/js/ScriptControllerGtk.cpp:
  • plugins/gtk/PluginViewGtk.cpp: (WebCore::PluginView::getValue): (WebCore::PluginView::~PluginView):
Location:
trunk/WebCore
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r35598 r35599  
     12008-08-06  Jan Michael Alonzo  <jmalonzo@webkit.org> 
     2 
     3        Gtk build fix only 
     4 
     5        * bindings/js/ScriptControllerGtk.cpp: 
     6        * plugins/gtk/PluginViewGtk.cpp: 
     7        (WebCore::PluginView::getValue): 
     8        (WebCore::PluginView::~PluginView): 
     9 
    1102008-08-06  Ariya Hidayat  <ariya.hidayat@trolltech.com> 
    211 

  • trunk/WebCore/bindings/js/ScriptControllerGtk.cpp

    r35590 r35599  
    3838namespace WebCore { 
    3939 
    40 PassRefPtr<KJS::Bindings::Instance> Frame::createScriptInstanceForWidget(Widget* widget) 
     40PassRefPtr<KJS::Bindings::Instance> ScriptController::createScriptInstanceForWidget(Widget* widget) 
    4141{ 
    4242    if (widget->isPluginView()) 

  • trunk/WebCore/plugins/gtk/PluginViewGtk.cpp

    r35478 r35599  
    401401                return NPERR_GENERIC_ERROR; 
    402402 
    403             NPObject* windowScriptObject = m_parentFrame->windowScriptNPObject(); 
     403            NPObject* windowScriptObject = m_parentFrame->script()->windowScriptNPObject(); 
    404404 
    405405            // Return value is expected to be retained, as described here: <http://www.mozilla.org/projects/plugin/npruntime.html> 
    … …  
    478478    freeStringArray(m_paramValues, m_paramCount); 
    479479 
    480     m_parentFrame->cleanupScriptObjectsForPlugin(this); 
     480    m_parentFrame->script()->cleanupScriptObjectsForPlugin(this); 
    481481 
    482482    if (m_plugin && !(m_plugin->quirks().contains(PluginQuirkDontUnloadPlugin)))