Changeset 37684 in webkit for trunk/JavaScriptCore/kjs/JSObject.h


Ignore:
Timestamp:
Oct 18, 2008, 6:52:42 PM (17 years ago)
Author:
Darin Adler
Message:

JavaScriptCore:

2008-10-18 Darin Adler <Darin Adler>

Reviewed by Cameron Zwarich.

Use JSValuePtr everywhere instead of JSValue*. In the future, we'll be
changing JSValuePtr to be a class, and then eventually renaming it
to JSValue once that's done.

  • JavaScriptCore.exp: Update entry points, since some now take JSValue* instead of const JSValue*.
  • API/APICast.h:
  • API/JSCallbackConstructor.h:
  • API/JSCallbackFunction.cpp:
  • API/JSCallbackFunction.h:
  • API/JSCallbackObject.h:
  • API/JSCallbackObjectFunctions.h:
  • API/JSContextRef.cpp:
  • API/JSObjectRef.cpp:
  • API/JSValueRef.cpp:
  • VM/CTI.cpp:
  • VM/CTI.h:
  • VM/CodeBlock.cpp:
  • VM/CodeBlock.h:
  • VM/CodeGenerator.cpp:
  • VM/CodeGenerator.h:
  • VM/ExceptionHelpers.cpp:
  • VM/ExceptionHelpers.h:
  • VM/JSPropertyNameIterator.cpp:
  • VM/JSPropertyNameIterator.h:
  • VM/Machine.cpp:
  • VM/Machine.h:
  • VM/Register.h:
  • kjs/ArgList.cpp:
  • kjs/ArgList.h:
  • kjs/Arguments.cpp:
  • kjs/Arguments.h:
  • kjs/ArrayConstructor.cpp:
  • kjs/ArrayPrototype.cpp:
  • kjs/BooleanConstructor.cpp:
  • kjs/BooleanConstructor.h:
  • kjs/BooleanObject.h:
  • kjs/BooleanPrototype.cpp:
  • kjs/CallData.cpp:
  • kjs/CallData.h:
  • kjs/ConstructData.cpp:
  • kjs/ConstructData.h:
  • kjs/DateConstructor.cpp:
  • kjs/DateInstance.h:
  • kjs/DatePrototype.cpp:
  • kjs/DebuggerCallFrame.cpp:
  • kjs/DebuggerCallFrame.h:
  • kjs/ErrorConstructor.cpp:
  • kjs/ErrorPrototype.cpp:
  • kjs/ExecState.cpp:
  • kjs/ExecState.h:
  • kjs/FunctionConstructor.cpp:
  • kjs/FunctionPrototype.cpp:
  • kjs/GetterSetter.cpp:
  • kjs/GetterSetter.h:
  • kjs/InternalFunction.h:
  • kjs/JSActivation.cpp:
  • kjs/JSActivation.h:
  • kjs/JSArray.cpp:
  • kjs/JSArray.h:
  • kjs/JSCell.cpp:
  • kjs/JSCell.h:
  • kjs/JSFunction.cpp:
  • kjs/JSFunction.h:
  • kjs/JSGlobalData.h:
  • kjs/JSGlobalObject.cpp:
  • kjs/JSGlobalObject.h:
  • kjs/JSGlobalObjectFunctions.cpp:
  • kjs/JSGlobalObjectFunctions.h:
  • kjs/JSImmediate.cpp:
  • kjs/JSImmediate.h:
  • kjs/JSNotAnObject.cpp:
  • kjs/JSNotAnObject.h:
  • kjs/JSNumberCell.cpp:
  • kjs/JSNumberCell.h:
  • kjs/JSObject.cpp:
  • kjs/JSObject.h:
  • kjs/JSStaticScopeObject.cpp:
  • kjs/JSStaticScopeObject.h:
  • kjs/JSString.cpp:
  • kjs/JSString.h:
  • kjs/JSValue.h:
  • kjs/JSVariableObject.h:
  • kjs/JSWrapperObject.h:
  • kjs/MathObject.cpp:
  • kjs/NativeErrorConstructor.cpp:
  • kjs/NumberConstructor.cpp:
  • kjs/NumberConstructor.h:
  • kjs/NumberObject.cpp:
  • kjs/NumberObject.h:
  • kjs/NumberPrototype.cpp:
  • kjs/ObjectConstructor.cpp:
  • kjs/ObjectPrototype.cpp:
  • kjs/ObjectPrototype.h:
  • kjs/PropertyMap.h:
  • kjs/PropertySlot.cpp:
  • kjs/PropertySlot.h:
  • kjs/RegExpConstructor.cpp:
  • kjs/RegExpConstructor.h:
  • kjs/RegExpMatchesArray.h:
  • kjs/RegExpObject.cpp:
  • kjs/RegExpObject.h:
  • kjs/RegExpPrototype.cpp:
  • kjs/Shell.cpp:
  • kjs/StringConstructor.cpp:
  • kjs/StringObject.cpp:
  • kjs/StringObject.h:
  • kjs/StringObjectThatMasqueradesAsUndefined.h:
  • kjs/StringPrototype.cpp:
  • kjs/StructureID.cpp:
  • kjs/StructureID.h:
  • kjs/collector.cpp:
  • kjs/collector.h:
  • kjs/completion.h:
  • kjs/grammar.y:
  • kjs/interpreter.cpp:
  • kjs/interpreter.h:
  • kjs/lookup.cpp:
  • kjs/lookup.h:
  • kjs/nodes.h:
  • kjs/operations.cpp:
  • kjs/operations.h:
  • kjs/protect.h:
  • profiler/ProfileGenerator.cpp: Replace JSValue* with JSValuePtr.

JavaScriptGlue:

2008-10-18 Darin Adler <Darin Adler>

Reviewed by Cameron Zwarich.

Use JSValuePtr everywhere instead of JSValue*. In the future, we'll be
changing JSValuePtr to be a class, and then eventually renaming it
to JSValue once that's done.

  • JSObject.cpp:
  • JSValueWrapper.cpp:
  • UserObjectImp.cpp:
  • UserObjectImp.h: Replace JSValue* with JSValuePtr.

WebCore:

2008-10-18 Darin Adler <Darin Adler>

Reviewed by Cameron Zwarich.

Use JSValuePtr everywhere instead of JSValue*. In the future, we'll be
changing JSValuePtr to be a class, and then eventually renaming it
to JSValue once that's done.

  • bindings/js/JSAttrCustom.cpp:
  • bindings/js/JSCSSRuleCustom.cpp:
  • bindings/js/JSCSSStyleDeclarationCustom.cpp:
  • bindings/js/JSCSSValueCustom.cpp:
  • bindings/js/JSCanvasPixelArrayCustom.h:
  • bindings/js/JSCanvasRenderingContext2DCustom.cpp:
  • bindings/js/JSClipboardCustom.cpp:
  • bindings/js/JSConsoleCustom.cpp:
  • bindings/js/JSCustomSQLStatementCallback.cpp:
  • bindings/js/JSCustomSQLStatementErrorCallback.cpp:
  • bindings/js/JSCustomSQLTransactionCallback.cpp:
  • bindings/js/JSCustomSQLTransactionErrorCallback.cpp:
  • bindings/js/JSCustomVoidCallback.cpp:
  • bindings/js/JSCustomVoidCallback.h:
  • bindings/js/JSCustomXPathNSResolver.cpp:
  • bindings/js/JSDOMApplicationCacheCustom.cpp:
  • bindings/js/JSDOMBinding.cpp:
  • bindings/js/JSDOMBinding.h:
  • bindings/js/JSDOMWindowBase.cpp:
  • bindings/js/JSDOMWindowBase.h:
  • bindings/js/JSDOMWindowCustom.cpp:
  • bindings/js/JSDOMWindowCustom.h:
  • bindings/js/JSDOMWindowShell.cpp:
  • bindings/js/JSDOMWindowShell.h:
  • bindings/js/JSDatabaseCustom.cpp:
  • bindings/js/JSDocumentCustom.cpp:
  • bindings/js/JSElementCustom.cpp:
  • bindings/js/JSEventCustom.cpp:
  • bindings/js/JSEventListener.cpp:
  • bindings/js/JSEventTarget.cpp:
  • bindings/js/JSEventTargetBase.h:
  • bindings/js/JSEventTargetNodeCustom.cpp:
  • bindings/js/JSHTMLAllCollection.h:
  • bindings/js/JSHTMLAppletElementCustom.cpp:
  • bindings/js/JSHTMLCollectionCustom.cpp:
  • bindings/js/JSHTMLDocumentCustom.cpp:
  • bindings/js/JSHTMLEmbedElementCustom.cpp:
  • bindings/js/JSHTMLFormElementCustom.cpp:
  • bindings/js/JSHTMLFrameElementCustom.cpp:
  • bindings/js/JSHTMLFrameSetElementCustom.cpp:
  • bindings/js/JSHTMLIFrameElementCustom.cpp:
  • bindings/js/JSHTMLInputElementCustom.cpp:
  • bindings/js/JSHTMLObjectElementCustom.cpp:
  • bindings/js/JSHTMLOptionsCollectionCustom.cpp:
  • bindings/js/JSHTMLSelectElementCustom.cpp:
  • bindings/js/JSHTMLSelectElementCustom.h:
  • bindings/js/JSHistoryCustom.cpp:
  • bindings/js/JSImageDataCustom.cpp:
  • bindings/js/JSInspectedObjectWrapper.cpp:
  • bindings/js/JSInspectedObjectWrapper.h:
  • bindings/js/JSInspectorCallbackWrapper.cpp:
  • bindings/js/JSInspectorCallbackWrapper.h:
  • bindings/js/JSJavaScriptCallFrameCustom.cpp:
  • bindings/js/JSLocationCustom.cpp:
  • bindings/js/JSMessagePortCustom.cpp:
  • bindings/js/JSMimeTypeArrayCustom.cpp:
  • bindings/js/JSNamedNodeMapCustom.cpp:
  • bindings/js/JSNamedNodesCollection.cpp:
  • bindings/js/JSNamedNodesCollection.h:
  • bindings/js/JSNavigatorCustom.cpp:
  • bindings/js/JSNodeCustom.cpp:
  • bindings/js/JSNodeFilterCondition.cpp:
  • bindings/js/JSNodeFilterCustom.cpp:
  • bindings/js/JSNodeIteratorCustom.cpp:
  • bindings/js/JSNodeListCustom.cpp:
  • bindings/js/JSPluginArrayCustom.cpp:
  • bindings/js/JSPluginCustom.cpp:
  • bindings/js/JSPluginElementFunctions.cpp:
  • bindings/js/JSPluginElementFunctions.h:
  • bindings/js/JSQuarantinedObjectWrapper.cpp:
  • bindings/js/JSQuarantinedObjectWrapper.h:
  • bindings/js/JSRGBColor.cpp:
  • bindings/js/JSRGBColor.h:
  • bindings/js/JSSQLResultSetRowListCustom.cpp:
  • bindings/js/JSSQLTransactionCustom.cpp:
  • bindings/js/JSSVGElementInstanceCustom.cpp:
  • bindings/js/JSSVGLengthCustom.cpp:
  • bindings/js/JSSVGMatrixCustom.cpp:
  • bindings/js/JSSVGPathSegCustom.cpp:
  • bindings/js/JSSVGPathSegListCustom.cpp:
  • bindings/js/JSSVGPointListCustom.cpp:
  • bindings/js/JSSVGTransformListCustom.cpp:
  • bindings/js/JSStorageCustom.cpp:
  • bindings/js/JSStyleSheetCustom.cpp:
  • bindings/js/JSStyleSheetListCustom.cpp:
  • bindings/js/JSTextCustom.cpp:
  • bindings/js/JSTreeWalkerCustom.cpp:
  • bindings/js/JSXMLHttpRequestCustom.cpp:
  • bindings/js/JSXMLHttpRequestUploadCustom.cpp:
  • bindings/js/JSXSLTProcessorCustom.cpp:
  • bindings/js/ScheduledAction.cpp:
  • bindings/js/ScheduledAction.h:
  • bindings/js/ScriptController.cpp:
  • bindings/js/ScriptController.h:
  • bindings/objc/WebScriptObject.mm:
  • bindings/scripts/CodeGeneratorJS.pm:
  • bridge/NP_jsobject.cpp:
  • bridge/c/c_instance.cpp:
  • bridge/c/c_instance.h:
  • bridge/c/c_runtime.cpp:
  • bridge/c/c_runtime.h:
  • bridge/c/c_utility.cpp:
  • bridge/jni/jni_instance.cpp:
  • bridge/jni/jni_instance.h:
  • bridge/jni/jni_jsobject.mm:
  • bridge/jni/jni_objc.mm:
  • bridge/jni/jni_runtime.cpp:
  • bridge/jni/jni_runtime.h:
  • bridge/jni/jni_utility.cpp:
  • bridge/objc/objc_class.mm:
  • bridge/objc/objc_instance.h:
  • bridge/objc/objc_instance.mm:
  • bridge/objc/objc_runtime.h:
  • bridge/objc/objc_runtime.mm:
  • bridge/objc/objc_utility.h:
  • bridge/objc/objc_utility.mm:
  • bridge/runtime.h:
  • bridge/runtime_array.cpp:
  • bridge/runtime_array.h:
  • bridge/runtime_method.cpp:
  • bridge/runtime_method.h:
  • bridge/runtime_object.cpp:
  • bridge/runtime_object.h:
  • inspector/JavaScriptCallFrame.cpp:
  • inspector/JavaScriptCallFrame.h:
  • inspector/JavaScriptProfile.cpp:
  • inspector/JavaScriptProfileNode.cpp:
  • loader/FrameLoader.cpp:
  • loader/FrameLoader.h:
  • page/Console.cpp:
  • page/Console.h:
  • plugins/MimeTypeArray.h:
  • plugins/Plugin.h:
  • plugins/PluginArray.h:
  • xml/XMLHttpRequest.cpp: Replace JSValue* with JSValuePtr.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/kjs/JSObject.h

    r37681 r37684  
    6868        bool inherits(const ClassInfo* classInfo) const { return JSCell::isObject(classInfo); }
    6969
    70         JSValue* prototype() const;
    71         void setPrototype(JSValue* prototype);
     70        JSValuePtr prototype() const;
     71        void setPrototype(JSValuePtr prototype);
    7272       
    7373        void setStructureID(PassRefPtr<StructureID>);
    … …  
    7878        virtual UString className() const;
    7979
    80         JSValue* get(ExecState*, const Identifier& propertyName) const;
    81         JSValue* get(ExecState*, unsigned propertyName) const;
     80        JSValuePtr get(ExecState*, const Identifier& propertyName) const;
     81        JSValuePtr get(ExecState*, unsigned propertyName) const;
    8282
    8383        bool getPropertySlot(ExecState*, const Identifier& propertyName, PropertySlot&);
    … …  
    8787        virtual bool getOwnPropertySlot(ExecState*, unsigned propertyName, PropertySlot&);
    8888
    89         virtual void put(ExecState*, const Identifier& propertyName, JSValue* value, PutPropertySlot&);
    90         virtual void put(ExecState*, unsigned propertyName, JSValue* value);
    91 
    92         virtual void putWithAttributes(ExecState*, const Identifier& propertyName, JSValue* value, unsigned attributes);
    93         virtual void putWithAttributes(ExecState*, unsigned propertyName, JSValue* value, unsigned attributes);
     89        virtual void put(ExecState*, const Identifier& propertyName, JSValuePtr value, PutPropertySlot&);
     90        virtual void put(ExecState*, unsigned propertyName, JSValuePtr value);
     91
     92        virtual void putWithAttributes(ExecState*, const Identifier& propertyName, JSValuePtr value, unsigned attributes);
     93        virtual void putWithAttributes(ExecState*, unsigned propertyName, JSValuePtr value, unsigned attributes);
    9494
    9595        bool propertyIsEnumerable(ExecState*, const Identifier& propertyName) const;
    … …  
    102102        virtual bool deleteProperty(ExecState*, unsigned propertyName);
    103103
    104         virtual JSValue* defaultValue(ExecState*, PreferredPrimitiveType) const;
    105 
    106         virtual bool hasInstance(ExecState*, JSValue*, JSValue* prototypeProperty);
     104        virtual JSValuePtr defaultValue(ExecState*, PreferredPrimitiveType) const;
     105
     106        virtual bool hasInstance(ExecState*, JSValuePtr, JSValuePtr prototypeProperty);
    107107
    108108        virtual void getPropertyNames(ExecState*, PropertyNameArray&);
    109109
    110         virtual JSValue* toPrimitive(ExecState*, PreferredPrimitiveType = NoPreference) const;
    111         virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue*& value);
     110        virtual JSValuePtr toPrimitive(ExecState*, PreferredPrimitiveType = NoPreference) const;
     111        virtual bool getPrimitiveNumber(ExecState*, double& number, JSValuePtr& value);
    112112        virtual bool toBoolean(ExecState*) const;
    113113        virtual double toNumber(ExecState*) const;
    … …  
    121121
    122122        // This get function only looks at the property map.
    123         JSValue* getDirect(const Identifier& propertyName) const
     123        JSValuePtr getDirect(const Identifier& propertyName) const
    124124        {
    125125            size_t offset = m_structureID->propertyMap().get(propertyName);
    … …  
    127127        }
    128128
    129         JSValue** getDirectLocation(const Identifier& propertyName)
     129        JSValuePtr* getDirectLocation(const Identifier& propertyName)
    130130        {
    131131            size_t offset = m_structureID->propertyMap().get(propertyName);
    … …  
    133133        }
    134134
    135         JSValue** getDirectLocation(const Identifier& propertyName, unsigned& attributes)
     135        JSValuePtr* getDirectLocation(const Identifier& propertyName, unsigned& attributes)
    136136        {
    137137            size_t offset = m_structureID->propertyMap().get(propertyName, attributes);
    … …  
    139139        }
    140140
    141         size_t offsetForLocation(JSValue** location)
     141        size_t offsetForLocation(JSValuePtr* location)
    142142        {
    143143            return location - m_propertyStorage;
    144144        }
    145145
    146         JSValue** locationForOffset(size_t offset)
     146        JSValuePtr* locationForOffset(size_t offset)
    147147        {
    148148            return &m_propertyStorage[offset];
    … …  
    155155        bool hasGetterSetterProperties() { return m_structureID->hasGetterSetterProperties(); }
    156156
    157         void putDirect(const Identifier& propertyName, JSValue* value, unsigned attr = 0);
    158         void putDirect(const Identifier& propertyName, JSValue* value, unsigned attr, bool checkReadOnly, PutPropertySlot& slot);
     157        void putDirect(const Identifier& propertyName, JSValuePtr value, unsigned attr = 0);
     158        void putDirect(const Identifier& propertyName, JSValuePtr value, unsigned attr, bool checkReadOnly, PutPropertySlot& slot);
    159159        void putDirectFunction(ExecState* exec, InternalFunction* function, unsigned attr = 0);
    160         void putDirectWithoutTransition(const Identifier& propertyName, JSValue* value, unsigned attr);
     160        void putDirectWithoutTransition(const Identifier& propertyName, JSValuePtr value, unsigned attr);
    161161        void putDirectFunctionWithoutTransition(ExecState* exec, InternalFunction* function, unsigned attr);
    162162
    163163        // Fast access to known property offsets.
    164         JSValue* getDirectOffset(size_t offset) { return m_propertyStorage[offset]; }
    165         void putDirectOffset(size_t offset, JSValue* value) { m_propertyStorage[offset] = value; }
    166 
    167         void fillGetterPropertySlot(PropertySlot&, JSValue** location);
     164        JSValuePtr getDirectOffset(size_t offset) { return m_propertyStorage[offset]; }
     165        void putDirectOffset(size_t offset, JSValuePtr value) { m_propertyStorage[offset] = value; }
     166
     167        void fillGetterPropertySlot(PropertySlot&, JSValuePtr* location);
    168168
    169169        virtual void defineGetter(ExecState*, const Identifier& propertyName, JSObject* getterFunction);
    170170        virtual void defineSetter(ExecState*, const Identifier& propertyName, JSObject* setterFunction);
    171         virtual JSValue* lookupGetter(ExecState*, const Identifier& propertyName);
    172         virtual JSValue* lookupSetter(ExecState*, const Identifier& propertyName);
     171        virtual JSValuePtr lookupGetter(ExecState*, const Identifier& propertyName);
     172        virtual JSValuePtr lookupSetter(ExecState*, const Identifier& propertyName);
    173173
    174174        virtual bool isGlobalObject() const { return false; }
    … …  
    184184        static const size_t nonInlineBaseStorageCapacity = 16;
    185185
    186         static PassRefPtr<StructureID> createStructureID(JSValue* proto) { return StructureID::create(proto, TypeInfo(ObjectType)); }
     186        static PassRefPtr<StructureID> createStructureID(JSValuePtr proto) { return StructureID::create(proto, TypeInfo(ObjectType)); }
    187187
    188188    protected:
    … …  
    196196
    197197        PropertyStorage m_propertyStorage;       
    198         JSValue* m_inlineStorage[inlineStorageCapacity];
     198        JSValuePtr m_inlineStorage[inlineStorageCapacity];
    199199    };
    200200
    201     JSObject* asObject(JSValue*);
     201    JSObject* asObject(JSValuePtr);
    202202
    203203    JSObject* constructEmptyObject(ExecState*);
    204204
    205 inline JSObject* asObject(JSValue* value)
     205inline JSObject* asObject(JSValuePtr value)
    206206{
    207207    ASSERT(asCell(value)->isObject());
    … …  
    227227}
    228228
    229 inline JSValue* JSObject::prototype() const
     229inline JSValuePtr JSObject::prototype() const
    230230{
    231231    return m_structureID->storedPrototype();
    232232}
    233233
    234 inline void JSObject::setPrototype(JSValue* prototype)
     234inline void JSObject::setPrototype(JSValuePtr prototype)
    235235{
    236236    ASSERT(prototype);
    … …  
    267267}
    268268
    269 inline JSValue* JSObject::get(ExecState* exec, const Identifier& propertyName) const
     269inline JSValuePtr JSObject::get(ExecState* exec, const Identifier& propertyName) const
    270270{
    271271    PropertySlot slot(this);
    … …  
    276276}
    277277
    278 inline JSValue* JSObject::get(ExecState* exec, unsigned propertyName) const
     278inline JSValuePtr JSObject::get(ExecState* exec, unsigned propertyName) const
    279279{
    280280    PropertySlot slot(this);
    … …  
    294294            return true;
    295295
    296         JSValue* prototype = object->prototype();
     296        JSValuePtr prototype = object->prototype();
    297297        if (!prototype->isObject())
    298298            return false;
    … …  
    310310            return true;
    311311
    312         JSValue* prototype = object->prototype();
     312        JSValuePtr prototype = object->prototype();
    313313        if (!prototype->isObject())
    314314            break;
    … …  
    326326{
    327327    unsigned attributes;
    328     if (JSValue** location = getDirectLocation(propertyName, attributes)) {
     328    if (JSValuePtr* location = getDirectLocation(propertyName, attributes)) {
    329329        if (m_structureID->hasGetterSetterProperties() && location[0]->isGetterSetter()) {
    330330            slotIsWriteable = false;
    … …  
    352352ALWAYS_INLINE bool JSObject::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
    353353{
    354     if (JSValue** location = getDirectLocation(propertyName)) {
     354    if (JSValuePtr* location = getDirectLocation(propertyName)) {
    355355        if (m_structureID->hasGetterSetterProperties() && location[0]->isGetterSetter())
    356356            fillGetterPropertySlot(slot, location);
    … …  
    369369}
    370370
    371 inline void JSObject::putDirect(const Identifier& propertyName, JSValue* value, unsigned attr)
     371inline void JSObject::putDirect(const Identifier& propertyName, JSValuePtr value, unsigned attr)
    372372{
    373373    PutPropertySlot slot;
    … …  
    375375}
    376376
    377 inline void JSObject::putDirect(const Identifier& propertyName, JSValue* value, unsigned attributes, bool checkReadOnly, PutPropertySlot& slot)
     377inline void JSObject::putDirect(const Identifier& propertyName, JSValuePtr value, unsigned attributes, bool checkReadOnly, PutPropertySlot& slot)
    378378{
    379379    ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
    … …  
    425425}
    426426
    427 inline void JSObject::putDirectWithoutTransition(const Identifier& propertyName, JSValue* value, unsigned attributes)
     427inline void JSObject::putDirectWithoutTransition(const Identifier& propertyName, JSValuePtr value, unsigned attributes)
    428428{
    429429    size_t currentCapacity = m_structureID->propertyStorageCapacity();
    … …  
    441441}
    442442
    443 inline JSValue* JSObject::toPrimitive(ExecState* exec, PreferredPrimitiveType preferredType) const
     443inline JSValuePtr JSObject::toPrimitive(ExecState* exec, PreferredPrimitiveType preferredType) const
    444444{
    445445    return defaultValue(exec, preferredType);
    446446}
    447447
    448 inline JSValue* JSValue::get(ExecState* exec, const Identifier& propertyName) const
     448inline JSValuePtr JSValue::get(ExecState* exec, const Identifier& propertyName) const
    449449{
    450450    PropertySlot slot(this);
    … …  
    452452}
    453453
    454 inline JSValue* JSValue::get(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) const
     454inline JSValuePtr JSValue::get(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) const
    455455{
    456456    if (UNLIKELY(JSImmediate::isImmediate(asValue()))) {
    … …  
    465465            return slot.getValue(exec, propertyName);
    466466        ASSERT(cell->isObject());
    467         JSValue* prototype = static_cast<JSObject*>(cell)->prototype();
     467        JSValuePtr prototype = static_cast<JSObject*>(cell)->prototype();
    468468        if (!prototype->isObject())
    469469            return jsUndefined();
    … …  
    472472}
    473473
    474 inline JSValue* JSValue::get(ExecState* exec, unsigned propertyName) const
     474inline JSValuePtr JSValue::get(ExecState* exec, unsigned propertyName) const
    475475{
    476476    PropertySlot slot(this);
    … …  
    478478}
    479479
    480 inline JSValue* JSValue::get(ExecState* exec, unsigned propertyName, PropertySlot& slot) const
     480inline JSValuePtr JSValue::get(ExecState* exec, unsigned propertyName, PropertySlot& slot) const
    481481{
    482482    if (UNLIKELY(JSImmediate::isImmediate(asValue()))) {
    … …  
    491491            return slot.getValue(exec, propertyName);
    492492        ASSERT(cell->isObject());
    493         JSValue* prototype = static_cast<JSObject*>(cell)->prototype();
     493        JSValuePtr prototype = static_cast<JSObject*>(cell)->prototype();
    494494        if (!prototype->isObject())
    495495            return jsUndefined();
    … …  
    498498}
    499499
    500 inline void JSValue::put(ExecState* exec, const Identifier& propertyName, JSValue* value, PutPropertySlot& slot)
     500inline void JSValue::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot)
    501501{
    502502    if (UNLIKELY(JSImmediate::isImmediate(asValue()))) {
    … …  
    507507}
    508508
    509 inline void JSValue::put(ExecState* exec, unsigned propertyName, JSValue* value)
     509inline void JSValue::put(ExecState* exec, unsigned propertyName, JSValuePtr value)
    510510{
    511511    if (UNLIKELY(JSImmediate::isImmediate(asValue()))) {
    … …  
    520520    ASSERT(newSize > oldSize);
    521521
    522     JSValue** oldPropertyStorage = m_propertyStorage;
    523     m_propertyStorage = new JSValue*[newSize];
     522    JSValuePtr* oldPropertyStorage = m_propertyStorage;
     523    m_propertyStorage = new JSValuePtr[newSize];
    524524
    525525    for (unsigned i = 0; i < oldSize; ++i)
Note: See TracChangeset for help on using the changeset viewer.