Changeset 30534 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp


Ignore:
Timestamp:
Feb 23, 2008, 9:01:27 PM (17 years ago)
Author:
Darin Adler
Message:

JavaScriptCore:

Reviewed by Anders.

  • API/JSCallbackObject.h: Removed attribute arguments.
  • API/JSCallbackObjectFunctions.h: (KJS::JSCallbackObject<Base>::put): Ditto.
  • API/JSObjectRef.cpp: (JSObjectSetProperty): Use initializeVariable or putDirect when necessary to set attribute values.
  • JavaScriptCore.exp: Updated.
  • bindings/objc/objc_runtime.h: Removed attribute arguments.
  • bindings/objc/objc_runtime.mm: (ObjcFallbackObjectImp::put): Ditto.
  • bindings/runtime_array.cpp: (RuntimeArray::put): Ditto.
  • bindings/runtime_array.h: Ditto.
  • bindings/runtime_object.cpp: (RuntimeObjectImp::put): Ditto.
  • bindings/runtime_object.h: Ditto. Also removed canPut which was only called from one place in WebCore that can use hasProperty instead.
  • kjs/Activation.h: Removed attribute argument from put and added the new initializeVariable function that's used to put variables in variable objects. Also made isActivationObject a const member.
  • kjs/JSGlobalObject.cpp: (KJS::JSGlobalObject::put): Removed attribute argument. (KJS::JSGlobalObject::initializeVariable): Added. Used to give variables their initial values, which can include the read-only property. (KJS::JSGlobalObject::reset): Removed obsolete comments about flags. Removed Internal flag, which is no longer needed.
  • kjs/JSGlobalObject.h: More of the same.
  • kjs/JSVariableObject.h: Added pure virtual initializeVariable function. (KJS::JSVariableObject::symbolTablePut): Removed checkReadOnly flag; we always check read-only. (KJS::JSVariableObject::symbolTableInitializeVariable): Added.
  • kjs/array_instance.cpp: (KJS::ArrayInstance::put): Removed attribute argument.
  • kjs/array_instance.h: Ditto.
  • kjs/function.cpp: (KJS::FunctionImp::put): Ditto. (KJS::Arguments::put): Ditto. (KJS::ActivationImp::put): Ditto. (KJS::ActivationImp::initializeVariable): Added.
  • kjs/function.h: Removed attribute arguments.
  • kjs/function_object.cpp: (KJS::FunctionObjectImp::construct): Removed Internal flag.
  • kjs/lookup.h: (KJS::lookupPut): Removed attributes argument. Also changed to use putDirect instead of calling JSObject::put. (KJS::cacheGlobalObject): Ditto.
  • kjs/nodes.cpp: (KJS::ConstDeclNode::handleSlowCase): Call initializeVariable to initialize the constant. (KJS::ConstDeclNode::evaluateSingle): Ditto. (KJS::TryNode::execute): Use putDirect to set up the new object. (KJS::FunctionBodyNode::processDeclarations): Removed Internal. (KJS::ProgramNode::processDeclarations): Ditto. (KJS::EvalNode::processDeclarations): Call initializeVariable to initialize the variables and functions. (KJS::FuncDeclNode::makeFunction): Removed Internal. (KJS::FuncExprNode::evaluate): Ditto.
  • kjs/object.cpp: Removed canPut, which was only being used in one code path, not the normal high speed one. (KJS::JSObject::put): Removed attribute argument. Moved the logic from canPut here, in the one code ath that was still using it.
  • kjs/object.h: Removed Internal attribute, ad canPut function. Removed the attributes argument to the put function. Made isActivationObject const.
  • kjs/regexp_object.cpp: (KJS::RegExpImp::put): Removed attributes argument. (KJS::RegExpImp::putValueProperty): Ditto. (KJS::RegExpObjectImp::put): Ditto. (KJS::RegExpObjectImp::putValueProperty): Ditto.
  • kjs/regexp_object.h: Ditto.
  • kjs/string_object.cpp: (KJS::StringInstance::put): Removed attributes argument.
  • kjs/string_object.h: Ditto.

WebCore:

Reviewed by Anders.

  • bindings/js/JSCSSStyleDeclarationCustom.cpp: (WebCore::JSCSSStyleDeclaration::customPut): Remove attributes argument.
  • bindings/js/JSCanvasPixelArrayCustom.cpp: (WebCore::JSCanvasPixelArray::indexGetter): Use early exit idiom. (WebCore::JSCanvasPixelArray::indexSetter): Moved length check into the CanvasPixelArray object, for consistency with the getter. Removed attributes argument.
  • bindings/js/JSDOMWindowCustom.cpp: (WebCore::JSDOMWindow::customPut): Removed special case for variable initialization, which is not needed since that does use put any more. Removed attributes argument.
  • bindings/js/JSEventTargetBase.h: (WebCore::JSEventTargetBase::putValueProperty): Removed attributes argument. (WebCore::JSEventTargetBase::put): Ditto. (WebCore::JSEventTargetPrototype::self): Removed Internal flag.
  • bindings/js/JSEventTargetNode.cpp: (WebCore::JSEventTargetNode::put): Removed attributes argument. (WebCore::JSEventTargetNode::putValueProperty): Ditto.
  • bindings/js/JSEventTargetNode.h: Ditto.
  • bindings/js/JSHTMLAppletElementCustom.cpp: (WebCore::JSHTMLAppletElement::customPut): Ditto.
  • bindings/js/JSHTMLEmbedElementCustom.cpp: (WebCore::JSHTMLEmbedElement::customPut): Ditto.
  • bindings/js/JSHTMLInputElementBase.cpp: (WebCore::JSHTMLInputElementBase::put): Ditto. (WebCore::JSHTMLInputElementBase::putValueProperty): Ditto.
  • bindings/js/JSHTMLInputElementBase.h: Ditto.
  • bindings/js/JSHTMLObjectElementCustom.cpp: (WebCore::JSHTMLObjectElement::customPut): Ditto.
  • bindings/js/JSHTMLOptionsCollectionCustom.cpp: (WebCore::JSHTMLOptionsCollection::indexSetter): Ditto.
  • bindings/js/JSHTMLSelectElementCustom.cpp: (WebCore::JSHTMLSelectElement::indexSetter): Ditto.
  • bindings/js/JSHistoryCustom.cpp: (WebCore::JSHistory::customPut): Ditto.
  • bindings/js/JSLocation.cpp: (WebCore::JSLocation::put): Ditto.
  • bindings/js/JSLocation.h: Ditto.
  • bindings/js/JSXMLHttpRequest.cpp: (WebCore::JSXMLHttpRequest::put): Ditto. (WebCore::JSXMLHttpRequest::putValueProperty): Ditto.
  • bindings/js/JSXMLHttpRequest.h: Ditto.
  • bindings/js/kjs_dom.cpp: (WebCore::getRuntimeObject): Changed return type to JSObject*.
  • bindings/js/kjs_dom.h: Ditto.
  • bindings/js/kjs_events.cpp: (WebCore::JSClipboard::put): Removed attributes argument. (WebCore::JSClipboard::putValueProperty): Ditto.
  • bindings/js/kjs_events.h: Ditto.
  • bindings/js/kjs_html.cpp: (WebCore::runtimeObjectGetter): Updated for change to getRuntimeObject to return a JSObject. Used early exit idiom. (WebCore::runtimeObjectPropertyGetter): Ditto. (WebCore::runtimeObjectCustomGetOwnPropertySlot): Ditto. (WebCore::runtimeObjectCustomPut): Use hasProperty to check for properties that we should put with the property syntax instead of canPut. (WebCore::runtimeObjectImplementsCall): Ditto. (WebCore::runtimeObjectCallAsFunction): Ditto.
  • bindings/js/kjs_html.h: Removed attributes argument to runtimeObjectCustomPut.
  • bindings/js/kjs_window.cpp: (KJS::Window::put): Removed attributes argument.
  • bindings/js/kjs_window.h: Ditto.
  • bindings/scripts/CodeGeneratorJS.pm: Removed attributes argument from put, putValueProperty, customPut, and indexSetter.
  • html/CanvasPixelArray.h: (WebCore::CanvasPixelArray::set): Added index checking here, as in the get function. Before, the checking was done in the JavaScript bindings for set.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/kjs/nodes.cpp

    r30492 r30534  
    35693569        if (base->getPropertySlot(exec, m_ident, slot))
    35703570            break;
    3571 
    35723571        ++iter;
    35733572    } while (iter != end);
    35743573
    3575     unsigned flags = 0;
    3576     base->getPropertyAttributes(m_ident, flags);
    3577     flags |= ReadOnly;
    3578 
    3579     base->put(exec, m_ident, val, flags);
     3574    ASSERT(base->isActivationObject() || base->isGlobalObject());
     3575
     3576    static_cast<JSVariableObject*>(base)->initializeVariable(exec, m_ident, val, ReadOnly);
    35803577}
    35813578
    … …  
    35853582    ASSERT(exec->variableObject()->hasOwnProperty(exec, m_ident) || exec->codeType() == EvalCode); // Guaranteed by processDeclarations.
    35863583    const ScopeChain& chain = exec->scopeChain();
    3587     JSObject* variableObject = exec->variableObject();
     3584    JSVariableObject* variableObject = exec->variableObject();
    35883585
    35893586    ASSERT(!chain.isEmpty());
    … …  
    35943591        if (inGlobalScope) {
    35953592            JSValue* val = m_init->evaluate(exec);
    3596             int flags = Internal;
     3593            unsigned attributes = ReadOnly;
    35973594            if (exec->codeType() != EvalCode)
    3598                 flags |= DontDelete;
    3599             flags |= ReadOnly;
    3600             variableObject->put(exec, m_ident, val, flags);
     3595                attributes |= DontDelete;
     3596            variableObject->initializeVariable(exec, m_ident, val, attributes);
    36013597        } else {
    36023598            JSValue* val = m_init->evaluate(exec);
    … …  
    36093605                return handleSlowCase(exec, chain, val);
    36103606
    3611             unsigned flags = 0;
    3612             variableObject->getPropertyAttributes(m_ident, flags);
    3613             flags |= ReadOnly;
    3614 
    3615             variableObject->put(exec, m_ident, val, flags);
     3607            variableObject->initializeVariable(exec, m_ident, val, ReadOnly);
    36163608        }
    36173609    }
    … …  
    43044296    if (m_catchBlock && exec->completionType() == Throw) {
    43054297        JSObject* obj = new JSObject;
    4306         obj->put(exec, m_exceptionIdent, result, DontDelete);
     4298        obj->putDirect(m_exceptionIdent, result, DontDelete);
    43074299        exec->dynamicGlobalObject()->tearOffActivation(exec);
    43084300        exec->pushScope(obj);
    … …  
    44864478        localStorage.reserveCapacity(totalSize);
    44874479
    4488     int minAttributes = Internal | DontDelete;
     4480    int minAttributes = DontDelete;
    44894481
    44904482    // In order for our localStorage indexes to be correct, we must match the
    … …  
    45334525    localStorage.reserveCapacity(localStorage.size() + m_varStack.size() + m_functionStack.size());
    45344526
    4535     int minAttributes = Internal | DontDelete;
     4527    int minAttributes = DontDelete;
    45364528
    45374529    // In order for our localStorage indexes to be correct, we must match the
    … …  
    45784570    JSVariableObject* variableObject = exec->variableObject();
    45794571
    4580     int minAttributes = Internal;
    4581 
    45824572    for (i = 0, size = m_varStack.size(); i < size; ++i) {
    45834573        Identifier& ident = m_varStack[i].first;
    45844574        if (variableObject->hasProperty(exec, ident))
    45854575            continue;
    4586         int attributes = minAttributes;
     4576        int attributes = 0;
    45874577        if (m_varStack[i].second & DeclarationStacks::IsConstant)
    4588             attributes |= ReadOnly;
    4589         variableObject->put(exec, ident, jsUndefined(), attributes);
     4578            attributes = ReadOnly;
     4579        variableObject->initializeVariable(exec, ident, jsUndefined(), attributes);
    45904580    }
    45914581
    45924582    for (i = 0, size = m_functionStack.size(); i < size; ++i) {
    4593         FuncDeclNode* node = m_functionStack[i];
    4594         variableObject->put(exec, node->m_ident, node->makeFunction(exec), minAttributes);
     4583        FuncDeclNode* funcDecl = m_functionStack[i];
     4584        variableObject->initializeVariable(exec, funcDecl->m_ident, funcDecl->makeFunction(exec), 0);
    45954585    }
    45964586}
    … …  
    46714661    JSObject* proto = exec->lexicalGlobalObject()->objectConstructor()->construct(exec, exec->emptyList());
    46724662    proto->putDirect(exec->propertyNames().constructor, func, DontEnum);
    4673     func->putDirect(exec->propertyNames().prototype, proto, Internal | DontDelete);
     4663    func->putDirect(exec->propertyNames().prototype, proto, DontDelete);
    46744664    func->putDirect(exec->propertyNames().length, jsNumber(m_body->parameters().size()), ReadOnly | DontDelete | DontEnum);
    46754665    return func;
    … …  
    47084698    JSObject* proto = exec->lexicalGlobalObject()->objectConstructor()->construct(exec, exec->emptyList());
    47094699    proto->putDirect(exec->propertyNames().constructor, func, DontEnum);
    4710     func->putDirect(exec->propertyNames().prototype, proto, Internal | DontDelete);
     4700    func->putDirect(exec->propertyNames().prototype, proto, DontDelete);
    47114701
    47124702    if (named) {
    4713         functionScopeObject->putDirect(m_ident, func, Internal | ReadOnly | (exec->codeType() == EvalCode ? 0 : DontDelete));
     4703        functionScopeObject->putDirect(m_ident, func, ReadOnly | (exec->codeType() == EvalCode ? 0 : DontDelete));
    47144704        exec->popScope();
    47154705    }
Note: See TracChangeset for help on using the changeset viewer.