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

    r424 r440  
    4646// TODO: MakeTime (15.9.11.1) etc. ? 
    4747 
     48ASSERT_CLASS_FITS_IN_CELL(DateConstructor); 
     49 
    4850static JSValue* dateParse(ExecState*, JSObject*, JSValue*, const ArgList&); 
    4951static JSValue* dateNow(ExecState*, JSObject*, JSValue*, const ArgList&); 
    …… 
    5153 
    5254DateConstructor::DateConstructor(ExecState* exec, FunctionPrototype* functionPrototype, DatePrototype* datePrototype) 
    53     : InternalFunction(functionPrototype, Identifier(exec, datePrototype->classInfo()->className)) 
     55    : InternalFunction(exec, functionPrototype, Identifier(exec, datePrototype->classInfo()->className)) 
    5456{ 
    5557      putDirect(exec->propertyNames().prototype, datePrototype, DontEnum|DontDelete|ReadOnly); 
    5658 
    57       putDirectFunction(new (exec) PrototypeFunction(exec, functionPrototype, 1, exec->propertyNames().parse, dateParse), DontEnum); 
    58       putDirectFunction(new (exec) PrototypeFunction(exec, functionPrototype, 7, exec->propertyNames().UTC, dateUTC), DontEnum); 
    59       putDirectFunction(new (exec) PrototypeFunction(exec, functionPrototype, 0, exec->propertyNames().now, dateNow), DontEnum); 
     59      putDirectFunction(exec, new (exec) PrototypeFunction(exec, functionPrototype, 1, exec->propertyNames().parse, dateParse), DontEnum); 
     60      putDirectFunction(exec, new (exec) PrototypeFunction(exec, functionPrototype, 7, exec->propertyNames().UTC, dateUTC), DontEnum); 
     61      putDirectFunction(exec, new (exec) PrototypeFunction(exec, functionPrototype, 0, exec->propertyNames().now, dateNow), DontEnum); 
    6062 
    6163      putDirect(exec, exec->propertyNames().length, 7, ReadOnly | DontEnum | DontDelete);