Show
Ignore:
Timestamp:
07/21/08 12:33:30 (2 years ago)
Author:
mbensi
Message:

merge with webkit revision 35260

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/JavaScriptCore/kjs/CallData.cpp

    r394 r404  
    3333JSValue* call(ExecState* exec, JSValue* functionObject, CallType callType, const CallData& callData, JSValue* thisValue, const ArgList& args) 
    3434{ 
    35     if (callType == CallTypeNative
     35    if (callType == CallTypeHost
    3636        return callData.native.function(exec, static_cast<JSObject*>(functionObject), thisValue, args); 
    3737    ASSERT(callType == CallTypeJS);