Show
Ignore:
Timestamp:
08/18/08 11:14:49 (5 months ago)
Author:
odole
Message:

merge with webkit revision 35814

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/JavaScriptCore/API/JSCallbackFunction.cpp

    r427 r440  
    3737namespace KJS { 
    3838 
     39ASSERT_CLASS_FITS_IN_CELL(JSCallbackFunction); 
     40 
    3941const ClassInfo JSCallbackFunction::info = { "CallbackFunction", &InternalFunction::info, 0, 0 }; 
    4042 
    4143JSCallbackFunction::JSCallbackFunction(ExecState* exec, JSObjectCallAsFunctionCallback callback, const Identifier& name) 
    42     : InternalFunction(exec->lexicalGlobalObject()->functionPrototype(), name) 
     44    : InternalFunction(exec, exec->lexicalGlobalObject()->functionPrototype(), name) 
    4345    , m_callback(callback) 
    4446{