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/PluginView.cpp

    r427 r433  
    480480        return 0; 
    481481 
    482     RefPtr<KJS::Bindings::RootObject> root = m_parentFrame->createRootObject(this, m_parentFrame->script()->globalObject()); 
     482    RefPtr<KJS::Bindings::RootObject> root = m_parentFrame->script()->createRootObject(this); 
    483483    RefPtr<KJS::Bindings::Instance> instance = KJS::Bindings::CInstance::create(object, root.release()); 
    484484