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/kjs/StringConstructor.cpp

    r424 r440  
    4545} 
    4646 
     47ASSERT_CLASS_FITS_IN_CELL(StringConstructor); 
     48 
    4749StringConstructor::StringConstructor(ExecState* exec, FunctionPrototype* functionPrototype, StringPrototype* stringPrototype) 
    48     : InternalFunction(functionPrototype, Identifier(exec, stringPrototype->classInfo()->className)) 
     50    : InternalFunction(exec, functionPrototype, Identifier(exec, stringPrototype->classInfo()->className)) 
    4951{ 
    5052    // ECMA 15.5.3.1 String.prototype 
     
    5254 
    5355    // ECMA 15.5.3.2 fromCharCode() 
    54     putDirectFunction(new (exec) PrototypeFunction(exec, functionPrototype, 1, exec->propertyNames().fromCharCode, stringFromCharCode), DontEnum); 
     56    putDirectFunction(exec, new (exec) PrototypeFunction(exec, functionPrototype, 1, exec->propertyNames().fromCharCode, stringFromCharCode), DontEnum); 
    5557 
    5658    // no. of arguments for constructor