Changeset 183005 in webkit for trunk/Source/JavaScriptCore/API/JSCallbackObject.h

Timestamp:

Apr 19, 2015, 11:05:26 PM (10 years ago)

Author:

Darin Adler

Message:

Remove all the remaining uses of OwnPtr and PassOwnPtr in JavaScriptCore
​https://bugs.webkit.org/show_bug.cgi?id=143941

Reviewed by Gyuyoung Kim.

• API/JSCallbackObject.h: Use unique_ptr for m_callbackObjectData.
• API/JSCallbackObjectFunctions.h: Ditto.

• API/ObjCCallbackFunction.h: Use unique_ptr for the arguments to the

create function and the constructor and for m_impl.

• API/ObjCCallbackFunction.mm:

(CallbackArgumentOfClass::CallbackArgumentOfClass): Streamline this
class by using RetainPtr<Class>.
(ArgumentTypeDelegate::typeInteger): Use make_unique.
(ArgumentTypeDelegate::typeDouble): Ditto.
(ArgumentTypeDelegate::typeBool): Ditto.
(ArgumentTypeDelegate::typeVoid): Ditto.
(ArgumentTypeDelegate::typeId): Ditto.
(ArgumentTypeDelegate::typeOfClass): Ditto.
(ArgumentTypeDelegate::typeBlock): Ditto.
(ArgumentTypeDelegate::typeStruct): Ditto.
(ResultTypeDelegate::typeInteger): Ditto.
(ResultTypeDelegate::typeDouble): Ditto.
(ResultTypeDelegate::typeBool): Ditto.
(ResultTypeDelegate::typeVoid): Ditto.
(ResultTypeDelegate::typeId): Ditto.
(ResultTypeDelegate::typeOfClass): Ditto.
(ResultTypeDelegate::typeBlock): Ditto.
(ResultTypeDelegate::typeStruct): Ditto.
(JSC::ObjCCallbackFunctionImpl::ObjCCallbackFunctionImpl): Use
unique_ptr for the arguments to the constructor, m_arguments, and m_result.
Use RetainPtr<Class> for m_instanceClass.
(JSC::objCCallbackFunctionCallAsConstructor): Use nullptr instead of nil or 0
for non-Objective-C object pointer null.
(JSC::ObjCCallbackFunction::ObjCCallbackFunction): Use unique_ptr for
the arguments to the constructor and for m_impl.
(JSC::ObjCCallbackFunction::create): Use unique_ptr for arguments.
(skipNumber): Mark this static since it's local to this source file.
(objCCallbackFunctionForInvocation): Call parseObjCType without doing any
explicit adoptPtr since the types in the traits are now unique_ptr. Also use
nullptr instead of nil for JSObjectRef values.
(objCCallbackFunctionForMethod): Tweaked comment.
(objCCallbackFunctionForBlock): Use nullptr instead of 0 for JSObjectRef.

• bytecode/CallLinkInfo.h: Removed unneeded include of OwnPtr.h.

• heap/GCThread.cpp:

(JSC::GCThread::GCThread): Use unique_ptr.

• heap/GCThread.h: Use unique_ptr for arguments to the constructor and for

m_slotVisitor and m_copyVisitor.

• heap/GCThreadSharedData.cpp:

(JSC::GCThreadSharedData::GCThreadSharedData): Ditto.

• parser/SourceProvider.h: Removed unneeded include of PassOwnPtr.h.

File:

• trunk/Source/JavaScriptCore/API/JSCallbackObject.h (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSCallbackObject.h

@@ -213 +213 @@
     static EncodedJSValue callbackGetter(ExecState*, JSObject*, EncodedJSValue, PropertyName);
 
-    OwnPtr<JSCallbackObjectData> m_callbackObjectData;
+    std::unique_ptr<JSCallbackObjectData> m_callbackObjectData;
 };