Commit 44331f8b authored by darin@apple.com's avatar darin@apple.com

JavaScriptCore:

2008-10-24  Darin Adler  <darin@apple.com>

        - finish rolling out https://bugs.webkit.org/show_bug.cgi?id=21732

        * 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/DatePrototype.h:
        * 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/FunctionPrototype.h:
        * 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/MathObject.h:
        * 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:
        * profiler/Profiler.cpp:
        * profiler/Profiler.h:
        Use JSValue* instead of JSValuePtr.

JavaScriptGlue:

2008-10-24  Darin Adler  <darin@apple.com>

        - finish rolling out https://bugs.webkit.org/show_bug.cgi?id=21732

        * JSObject.cpp:
        (nativeCallFunction):
        * JSUtils.cpp:
        (KJSValueToJSObject):
        (JSObjectKJSValue):
        (KJSValueToCFTypeInternal):
        (KJSValueToCFType):
        * JSUtils.h:
        * JSValueWrapper.cpp:
        (JSValueWrapper::JSValueWrapper):
        (JSValueWrapper::GetValue):
        (JSValueWrapper::JSObjectCopyProperty):
        (JSValueWrapper::JSObjectSetProperty):
        (JSValueWrapper::JSObjectCallFunction):
        * JSValueWrapper.h:
        * UserObjectImp.cpp:
        (UserObjectImp::callAsFunction):
        (UserObjectImp::userObjectGetter):
        (UserObjectImp::getOwnPropertySlot):
        (UserObjectImp::put):
        (UserObjectImp::toPrimitive):
        * UserObjectImp.h:
        (UserObjectImp::createStructureID):
        Use JSValue* instead of JSValuePtr.

WebCore:

2008-10-24  Darin Adler  <darin@apple.com>

        - finish rolling out https://bugs.webkit.org/show_bug.cgi?id=21732

        * 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/JSCustomXPathNSResolver.h:
        * 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/JSDedicatedWorkerCustom.cpp:
        * bindings/js/JSDocumentCustom.cpp:
        * bindings/js/JSElementCustom.cpp:
        * bindings/js/JSEventCustom.cpp:
        * bindings/js/JSEventListener.cpp:
        * bindings/js/JSEventTarget.cpp:
        * bindings/js/JSEventTarget.h:
        * 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/JSNodeFilterCondition.h:
        * 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/objc/WebScriptObjectPrivate.h:
        * 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/c/c_utility.h:
        * bridge/jni/jni_instance.cpp:
        * bridge/jni/jni_instance.h:
        * bridge/jni/jni_jsobject.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/jni/jni_utility.h:
        * bridge/objc/WebScriptObject.h:
        * bridge/objc/objc_class.h:
        * 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/qt/qt_class.cpp:
        * bridge/qt/qt_class.h:
        * bridge/qt/qt_instance.cpp:
        * bridge/qt/qt_instance.h:
        * bridge/qt/qt_runtime.cpp:
        * bridge/qt/qt_runtime.h:
        * bridge/runtime.cpp:
        * 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:
        * bridge/testqtbindings.cpp:
        * inspector/JavaScriptCallFrame.cpp:
        * inspector/JavaScriptCallFrame.h:
        * inspector/JavaScriptProfile.cpp:
        * inspector/JavaScriptProfile.h:
        * inspector/JavaScriptProfileNode.cpp:
        * inspector/JavaScriptProfileNode.h:
        * loader/FrameLoader.cpp:
        * loader/FrameLoader.h:
        * page/Console.cpp:
        * page/Console.h:
        * plugins/MimeTypeArray.h:
        * plugins/Plugin.h:
        * plugins/PluginArray.h:
        * plugins/PluginView.cpp:
        * xml/XMLHttpRequest.cpp:
        Use JSValue* instead of JSValuePtr.

WebKit/mac:

2008-10-24  Darin Adler  <darin@apple.com>

        - finish rolling out https://bugs.webkit.org/show_bug.cgi?id=21732

        * WebView/WebFrame.mm:
        (-[WebFrame _stringByEvaluatingJavaScriptFromString:forceUserGesture:]):
        * WebView/WebScriptDebugDelegate.mm:
        (-[WebScriptCallFrame _convertValueToObjcValue:]):
        (-[WebScriptCallFrame exception]):
        (-[WebScriptCallFrame evaluateWebScript:]):
        * WebView/WebView.mm:
        (aeDescFromJSValue):
        (-[WebView aeDescByEvaluatingJavaScriptFromString:]):
        Use JSValue* instead of JSValuePtr.

WebKit/qt:

2008-10-24  Darin Adler  <darin@apple.com>

        - finish rolling out https://bugs.webkit.org/show_bug.cgi?id=21732

        * Api/qwebframe.cpp:
        (QWebFrame::evaluateJavaScript): Use JSValue* instead of JSValuePtr.

WebKit/win:

2008-10-24  Darin Adler  <darin@apple.com>

        - finish rolling out https://bugs.webkit.org/show_bug.cgi?id=21732

        * WebScriptCallFrame.cpp:
        (WebScriptCallFrame::jsValueToString):
        (WebScriptCallFrame::stringByEvaluatingJavaScriptFromString):
        (WebScriptCallFrame::valueForVariable):
        (WebScriptCallFrame::valueByEvaluatingJavaScriptFromString):
        * WebScriptCallFrame.h:
        * WebView.cpp:
        (WebView::stringByEvaluatingJavaScriptFromString):
        Use JSValue* instead of JSValuePtr.

WebKit/wx:

2008-10-24  Darin Adler  <darin@apple.com>

        - finish rolling out https://bugs.webkit.org/show_bug.cgi?id=21732

        * WebFrame.cpp: (wxWebFrame::RunScript): Use JSValue* instead of JSValuePtr.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@37845 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent cffb4f44
......@@ -48,7 +48,7 @@ inline JSC::ExecState* toJS(JSGlobalContextRef c)
return reinterpret_cast<JSC::ExecState*>(c);
}
inline JSC::JSValuePtr toJS(JSValueRef v)
inline JSC::JSValue* toJS(JSValueRef v)
{
return reinterpret_cast<JSC::JSValue*>(const_cast<OpaqueJSValue*>(v));
}
......@@ -68,12 +68,12 @@ inline JSC::JSGlobalData* toJS(JSContextGroupRef g)
return reinterpret_cast<JSC::JSGlobalData*>(const_cast<OpaqueJSContextGroup*>(g));
}
inline JSValueRef toRef(JSC::JSValuePtr v)
inline JSValueRef toRef(JSC::JSValue* v)
{
return reinterpret_cast<JSValueRef>(v);
}
inline JSValueRef* toRef(JSC::JSValuePtr* v)
inline JSValueRef* toRef(JSC::JSValue** v)
{
return reinterpret_cast<JSValueRef*>(const_cast<const JSC::JSValue**>(v));
}
......
......@@ -39,7 +39,7 @@ public:
JSObjectCallAsConstructorCallback callback() const { return m_callback; }
static const ClassInfo info;
static PassRefPtr<StructureID> createStructureID(JSValuePtr proto)
static PassRefPtr<StructureID> createStructureID(JSValue* proto)
{
return StructureID::create(proto, TypeInfo(ObjectType, ImplementsHasInstance | HasStandardGetOwnPropertySlot));
}
......
......@@ -46,7 +46,7 @@ JSCallbackFunction::JSCallbackFunction(ExecState* exec, JSObjectCallAsFunctionCa
{
}
JSValuePtr JSCallbackFunction::call(ExecState* exec, JSObject* functionObject, JSValuePtr thisValue, const ArgList& args)
JSValue* JSCallbackFunction::call(ExecState* exec, JSObject* functionObject, JSValue* thisValue, const ArgList& args)
{
JSContextRef execRef = toRef(exec);
JSObjectRef functionRef = toRef(functionObject);
......
......@@ -39,7 +39,7 @@ public:
// InternalFunction mish-mashes constructor and function behavior -- we should
// refactor the code so this override isn't necessary
static PassRefPtr<StructureID> createStructureID(JSValuePtr proto)
static PassRefPtr<StructureID> createStructureID(JSValue* proto)
{
return StructureID::create(proto, TypeInfo(ObjectType, HasStandardGetOwnPropertySlot));
}
......@@ -48,7 +48,7 @@ private:
virtual CallType getCallData(CallData&);
virtual const ClassInfo* classInfo() const { return &info; }
static JSValuePtr call(ExecState*, JSObject*, JSValuePtr, const ArgList&);
static JSValue* call(ExecState*, JSObject*, JSValue*, const ArgList&);
JSObjectCallAsFunctionCallback m_callback;
};
......
......@@ -48,7 +48,7 @@ public:
JSClassRef classRef() const { return m_callbackObjectData->jsClass; }
bool inherits(JSClassRef) const;
static PassRefPtr<StructureID> createStructureID(JSValuePtr proto)
static PassRefPtr<StructureID> createStructureID(JSValue* proto)
{
return StructureID::create(proto, TypeInfo(ObjectType, ImplementsHasInstance | OverridesHasInstance));
}
......@@ -59,12 +59,12 @@ private:
virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
virtual bool getOwnPropertySlot(ExecState*, unsigned, PropertySlot&);
virtual void put(ExecState*, const Identifier&, JSValuePtr, PutPropertySlot&);
virtual void put(ExecState*, const Identifier&, JSValue*, PutPropertySlot&);
virtual bool deleteProperty(ExecState*, const Identifier&);
virtual bool deleteProperty(ExecState*, unsigned);
virtual bool hasInstance(ExecState* exec, JSValuePtr value, JSValuePtr proto);
virtual bool hasInstance(ExecState* exec, JSValue* value, JSValue* proto);
virtual void getPropertyNames(ExecState*, PropertyNameArray&);
......@@ -77,15 +77,15 @@ private:
void init(ExecState*);
static JSCallbackObject* asCallbackObject(JSValuePtr);
static JSCallbackObject* asCallbackObject(JSValue*);
static JSValuePtr call(ExecState*, JSObject* functionObject, JSValuePtr thisValue, const ArgList&);
static JSValue* call(ExecState*, JSObject* functionObject, JSValue* thisValue, const ArgList&);
static JSObject* construct(ExecState*, JSObject* constructor, const ArgList&);
static JSValuePtr cachedValueGetter(ExecState*, const Identifier&, const PropertySlot&);
static JSValuePtr staticValueGetter(ExecState*, const Identifier&, const PropertySlot&);
static JSValuePtr staticFunctionGetter(ExecState*, const Identifier&, const PropertySlot&);
static JSValuePtr callbackGetter(ExecState*, const Identifier&, const PropertySlot&);
static JSValue* cachedValueGetter(ExecState*, const Identifier&, const PropertySlot&);
static JSValue* staticValueGetter(ExecState*, const Identifier&, const PropertySlot&);
static JSValue* staticFunctionGetter(ExecState*, const Identifier&, const PropertySlot&);
static JSValue* callbackGetter(ExecState*, const Identifier&, const PropertySlot&);
struct JSCallbackObjectData {
JSCallbackObjectData(void* privateData_, JSClassRef jsClass_)
......
......@@ -40,7 +40,7 @@
namespace JSC {
template <class Base>
inline JSCallbackObject<Base>* JSCallbackObject<Base>::asCallbackObject(JSValuePtr value)
inline JSCallbackObject<Base>* JSCallbackObject<Base>::asCallbackObject(JSValue* value)
{
ASSERT(asObject(value)->inherits(&info));
return static_cast<JSCallbackObject*>(asObject(value));
......@@ -160,7 +160,7 @@ bool JSCallbackObject<Base>::getOwnPropertySlot(ExecState* exec, unsigned proper
}
template <class Base>
void JSCallbackObject<Base>::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot)
void JSCallbackObject<Base>::put(ExecState* exec, const Identifier& propertyName, JSValue* value, PutPropertySlot& slot)
{
JSContextRef ctx = toRef(exec);
JSObjectRef thisRef = toRef(this);
......@@ -280,7 +280,7 @@ JSObject* JSCallbackObject<Base>::construct(ExecState* exec, JSObject* construct
}
template <class Base>
bool JSCallbackObject<Base>::hasInstance(ExecState* exec, JSValuePtr value, JSValuePtr)
bool JSCallbackObject<Base>::hasInstance(ExecState* exec, JSValue* value, JSValue*)
{
JSContextRef execRef = toRef(exec);
JSObjectRef thisRef = toRef(this);
......@@ -307,7 +307,7 @@ CallType JSCallbackObject<Base>::getCallData(CallData& callData)
}
template <class Base>
JSValuePtr JSCallbackObject<Base>::call(ExecState* exec, JSObject* functionObject, JSValuePtr thisValue, const ArgList& args)
JSValue* JSCallbackObject<Base>::call(ExecState* exec, JSObject* functionObject, JSValue* thisValue, const ArgList& args)
{
JSContextRef execRef = toRef(exec);
JSObjectRef functionRef = toRef(functionObject);
......@@ -430,15 +430,15 @@ bool JSCallbackObject<Base>::inherits(JSClassRef c) const
}
template <class Base>
JSValuePtr JSCallbackObject<Base>::cachedValueGetter(ExecState*, const Identifier&, const PropertySlot& slot)
JSValue* JSCallbackObject<Base>::cachedValueGetter(ExecState*, const Identifier&, const PropertySlot& slot)
{
JSValuePtr v = slot.slotBase();
JSValue* v = slot.slotBase();
ASSERT(v);
return v;
}
template <class Base>
JSValuePtr JSCallbackObject<Base>::staticValueGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
JSValue* JSCallbackObject<Base>::staticValueGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
{
JSCallbackObject* thisObj = asCallbackObject(slot.slotBase());
......@@ -460,7 +460,7 @@ JSValuePtr JSCallbackObject<Base>::staticValueGetter(ExecState* exec, const Iden
}
template <class Base>
JSValuePtr JSCallbackObject<Base>::staticFunctionGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
JSValue* JSCallbackObject<Base>::staticFunctionGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
{
JSCallbackObject* thisObj = asCallbackObject(slot.slotBase());
......@@ -485,7 +485,7 @@ JSValuePtr JSCallbackObject<Base>::staticFunctionGetter(ExecState* exec, const I
}
template <class Base>
JSValuePtr JSCallbackObject<Base>::callbackGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
JSValue* JSCallbackObject<Base>::callbackGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
{
JSCallbackObject* thisObj = asCallbackObject(slot.slotBase());
......
......@@ -73,7 +73,7 @@ JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClass
JSGlobalObject* globalObject = new (globalData.get()) JSCallbackObject<JSGlobalObject>(globalObjectClass);
ExecState* exec = globalObject->globalExec();
JSValuePtr prototype = globalObjectClass->prototype(exec);
JSValue* prototype = globalObjectClass->prototype(exec);
if (!prototype)
prototype = jsNull();
globalObject->resetPrototype(prototype);
......
......@@ -103,7 +103,7 @@ JSObjectRef JSObjectMakeConstructor(JSContextRef ctx, JSClassRef jsClass, JSObje
exec->globalData().heap.registerThread();
JSLock lock(exec);
JSValuePtr jsPrototype = jsClass
JSValue* jsPrototype = jsClass
? jsClass->prototype(exec)
: exec->lexicalGlobalObject()->objectPrototype();
......@@ -233,7 +233,7 @@ JSValueRef JSObjectGetPrototype(JSContextRef, JSObjectRef object)
void JSObjectSetPrototype(JSContextRef, JSObjectRef object, JSValueRef value)
{
JSObject* jsObject = toJS(object);
JSValuePtr jsValue = toJS(value);
JSValue* jsValue = toJS(value);
jsObject->setPrototype(jsValue->isObject() ? jsValue : jsNull());
}
......@@ -257,7 +257,7 @@ JSValueRef JSObjectGetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef
JSObject* jsObject = toJS(object);
JSValuePtr jsValue = jsObject->get(exec, propertyName->identifier(&exec->globalData()));
JSValue* jsValue = jsObject->get(exec, propertyName->identifier(&exec->globalData()));
if (exec->hadException()) {
if (exception)
*exception = toRef(exec->exception());
......@@ -274,7 +274,7 @@ void JSObjectSetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef prope
JSObject* jsObject = toJS(object);
Identifier name(propertyName->identifier(&exec->globalData()));
JSValuePtr jsValue = toJS(value);
JSValue* jsValue = toJS(value);
if (attributes && !jsObject->hasProperty(exec, name))
jsObject->putWithAttributes(exec, name, jsValue, attributes);
......@@ -298,7 +298,7 @@ JSValueRef JSObjectGetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsi
JSObject* jsObject = toJS(object);
JSValuePtr jsValue = jsObject->get(exec, propertyIndex);
JSValue* jsValue = jsObject->get(exec, propertyIndex);
if (exec->hadException()) {
if (exception)
*exception = toRef(exec->exception());
......@@ -315,7 +315,7 @@ void JSObjectSetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsigned p
JSLock lock(exec);
JSObject* jsObject = toJS(object);
JSValuePtr jsValue = toJS(value);
JSValue* jsValue = toJS(value);
jsObject->put(exec, propertyIndex, jsValue);
if (exec->hadException()) {
......
......@@ -43,7 +43,7 @@
JSType JSValueGetType(JSContextRef, JSValueRef value)
{
JSC::JSValuePtr jsValue = toJS(value);
JSC::JSValue* jsValue = toJS(value);
if (jsValue->isUndefined())
return kJSTypeUndefined;
if (jsValue->isNull())
......@@ -62,43 +62,43 @@ using namespace JSC; // placed here to avoid conflict between JSC::JSType and JS
bool JSValueIsUndefined(JSContextRef, JSValueRef value)
{
JSValuePtr jsValue = toJS(value);
JSValue* jsValue = toJS(value);
return jsValue->isUndefined();
}
bool JSValueIsNull(JSContextRef, JSValueRef value)
{
JSValuePtr jsValue = toJS(value);
JSValue* jsValue = toJS(value);
return jsValue->isNull();
}
bool JSValueIsBoolean(JSContextRef, JSValueRef value)
{
JSValuePtr jsValue = toJS(value);
JSValue* jsValue = toJS(value);
return jsValue->isBoolean();
}
bool JSValueIsNumber(JSContextRef, JSValueRef value)
{
JSValuePtr jsValue = toJS(value);
JSValue* jsValue = toJS(value);
return jsValue->isNumber();
}
bool JSValueIsString(JSContextRef, JSValueRef value)
{
JSValuePtr jsValue = toJS(value);
JSValue* jsValue = toJS(value);
return jsValue->isString();
}
bool JSValueIsObject(JSContextRef, JSValueRef value)
{
JSValuePtr jsValue = toJS(value);
JSValue* jsValue = toJS(value);
return jsValue->isObject();
}
bool JSValueIsObjectOfClass(JSContextRef, JSValueRef value, JSClassRef jsClass)
{
JSValuePtr jsValue = toJS(value);
JSValue* jsValue = toJS(value);
if (JSObject* o = jsValue->getObject()) {
if (o->inherits(&JSCallbackObject<JSGlobalObject>::info))
......@@ -115,8 +115,8 @@ bool JSValueIsEqual(JSContextRef ctx, JSValueRef a, JSValueRef b, JSValueRef* ex
exec->globalData().heap.registerThread();
JSLock lock(exec);
JSValuePtr jsA = toJS(a);
JSValuePtr jsB = toJS(b);
JSValue* jsA = toJS(a);
JSValue* jsB = toJS(b);
bool result = equal(exec, jsA, jsB); // false if an exception is thrown
if (exec->hadException()) {
......@@ -129,8 +129,8 @@ bool JSValueIsEqual(JSContextRef ctx, JSValueRef a, JSValueRef b, JSValueRef* ex
bool JSValueIsStrictEqual(JSContextRef, JSValueRef a, JSValueRef b)
{
JSValuePtr jsA = toJS(a);
JSValuePtr jsB = toJS(b);
JSValue* jsA = toJS(a);
JSValue* jsB = toJS(b);
bool result = strictEqual(jsA, jsB);
return result;
......@@ -142,7 +142,7 @@ bool JSValueIsInstanceOfConstructor(JSContextRef ctx, JSValueRef value, JSObject
exec->globalData().heap.registerThread();
JSLock lock(exec);
JSValuePtr jsValue = toJS(value);
JSValue* jsValue = toJS(value);
JSObject* jsConstructor = toJS(constructor);
if (!jsConstructor->structureID()->typeInfo().implementsHasInstance())
return false;
......@@ -191,7 +191,7 @@ JSValueRef JSValueMakeString(JSContextRef ctx, JSStringRef string)
bool JSValueToBoolean(JSContextRef ctx, JSValueRef value)
{
ExecState* exec = toJS(ctx);
JSValuePtr jsValue = toJS(value);
JSValue* jsValue = toJS(value);
return jsValue->toBoolean(exec);
}
......@@ -201,7 +201,7 @@ double JSValueToNumber(JSContextRef ctx, JSValueRef value, JSValueRef* exception
exec->globalData().heap.registerThread();
JSLock lock(exec);
JSValuePtr jsValue = toJS(value);
JSValue* jsValue = toJS(value);
double number = jsValue->toNumber(exec);
if (exec->hadException()) {
......@@ -219,7 +219,7 @@ JSStringRef JSValueToStringCopy(JSContextRef ctx, JSValueRef value, JSValueRef*
exec->globalData().heap.registerThread();
JSLock lock(exec);
JSValuePtr jsValue = toJS(value);
JSValue* jsValue = toJS(value);
RefPtr<OpaqueJSString> stringRef(OpaqueJSString::create(jsValue->toString(exec)));
if (exec->hadException()) {
......@@ -237,7 +237,7 @@ JSObjectRef JSValueToObject(JSContextRef ctx, JSValueRef value, JSValueRef* exce
exec->globalData().heap.registerThread();
JSLock lock(exec);
JSValuePtr jsValue = toJS(value);
JSValue* jsValue = toJS(value);
JSObjectRef objectRef = toRef(jsValue->toObject(exec));
if (exec->hadException()) {
......@@ -255,7 +255,7 @@ void JSValueProtect(JSContextRef ctx, JSValueRef value)
exec->globalData().heap.registerThread();
JSLock lock(exec);
JSValuePtr jsValue = toJS(value);
JSValue* jsValue = toJS(value);
gcProtect(jsValue);
}
......@@ -265,6 +265,6 @@ void JSValueUnprotect(JSContextRef ctx, JSValueRef value)
exec->globalData().heap.registerThread();
JSLock lock(exec);
JSValuePtr jsValue = toJS(value);
JSValue* jsValue = toJS(value);
gcUnprotect(jsValue);
}
2008-10-24 Darin Adler <darin@apple.com>
- finish rolling out https://bugs.webkit.org/show_bug.cgi?id=21732
* 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/DatePrototype.h:
* 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/FunctionPrototype.h:
* 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/MathObject.h:
* 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:
* profiler/Profiler.cpp:
* profiler/Profiler.h:
Use JSValue* instead of JSValuePtr.
2008-10-24 David Kilzer <ddkilzer@apple.com>
Rolled out r37840.
......
This diff is collapsed.
......@@ -47,7 +47,7 @@
#define ARG_callFrame static_cast<CallFrame*>(ARGS[CTI_ARGS_callFrame])
#define ARG_registerFile static_cast<RegisterFile*>(ARGS[CTI_ARGS_registerFile])
#define ARG_exception static_cast<JSValuePtr*>(ARGS[CTI_ARGS_exception])
#define ARG_exception static_cast<JSValue**>(ARGS[CTI_ARGS_exception])
#define ARG_profilerReference static_cast<Profiler**>(ARGS[CTI_ARGS_profilerReference])
#define ARG_globalData static_cast<JSGlobalData*>(ARGS[CTI_ARGS_globalData])
......@@ -239,7 +239,7 @@ namespace JSC {
};
extern "C" {
JSValue* ctiTrampoline(void* code, RegisterFile*, CallFrame*, JSValuePtr* exception, Profiler**, JSGlobalData*);
JSValue* ctiTrampoline(void* code, RegisterFile*, CallFrame*, JSValue** exception, Profiler**, JSGlobalData*);
void ctiVMThrowTrampoline();
};
......@@ -338,7 +338,7 @@ namespace JSC {
static void linkCall(JSFunction* callee, CodeBlock* calleeCodeBlock, void* ctiCode, CallLinkInfo* callLinkInfo, int callerArgCount);
static void unlinkCall(CallLinkInfo*);