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

    r381 r440  
    2626#include "JSFunction.h" 
    2727 
     28#include "CommonIdentifiers.h" 
    2829#include "ExecState.h" 
    2930#include "FunctionPrototype.h" 
     
    4041namespace KJS { 
    4142 
    42 const ClassInfo JSFunction::info = { "Function", &InternalFunction::info, 0, 0 }; 
     43ASSERT_CLASS_FITS_IN_CELL(JSFunction); 
     44 
     45const ClassInfo JSFunction::info = { "Function", 0, 0, 0 }; 
    4346 
    4447JSFunction::JSFunction(ExecState* exec, const Identifier& name, FunctionBodyNode* body, ScopeChainNode* scopeChainNode) 
    45     : InternalFunction(exec->lexicalGlobalObject()->functionPrototype(), name) 
     48    : Base(exec, exec->lexicalGlobalObject()->functionPrototype(), name) 
    4649    , m_body(body) 
    4750    , m_scopeChain(scopeChainNode) 
     
    5154void JSFunction::mark() 
    5255{ 
    53     InternalFunction::mark(); 
     56    Base::mark(); 
    5457    m_body->mark(); 
    5558    m_scopeChain.mark(); 
     
    103106    } 
    104107 
    105     return InternalFunction::getOwnPropertySlot(exec, propertyName, slot); 
     108    return Base::getOwnPropertySlot(exec, propertyName, slot); 
    106109} 
    107110 
     
    110113    if (propertyName == exec->propertyNames().arguments || propertyName == exec->propertyNames().length) 
    111114        return; 
    112     InternalFunction::put(exec, propertyName, value); 
     115    Base::put(exec, propertyName, value); 
    113116} 
    114117 
     
    117120    if (propertyName == exec->propertyNames().arguments || propertyName == exec->propertyNames().length) 
    118121        return false; 
    119     return InternalFunction::deleteProperty(exec, propertyName); 
     122    return Base::deleteProperty(exec, propertyName); 
    120123} 
    121124