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

    r424 r440  
    2828namespace KJS { 
    2929 
     30ASSERT_CLASS_FITS_IN_CELL(ObjectConstructor); 
     31 
    3032ObjectConstructor::ObjectConstructor(ExecState* exec, ObjectPrototype* objectPrototype, FunctionPrototype* functionPrototype) 
    31     : InternalFunction(functionPrototype, Identifier(exec, "Object")) 
     33    : InternalFunction(exec, functionPrototype, Identifier(exec, "Object")) 
    3234{ 
    3335    // ECMA 15.2.3.1