diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-07-15 12:03:35 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-07-20 16:57:23 +0100 |
| commit | e458d70a0d18538346f41b503114c9ebe6b2ce12 (patch) | |
| tree | 86f1637deca2c524432a822e5fcedd4bef221091 /JavaScriptCore/API | |
| parent | f43eabc081f7ce6af24b9df4953498a3cd6ca24d (diff) | |
| download | external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.zip external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.tar.gz external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.tar.bz2 | |
Merge WebKit at r63173 : Initial merge by git.
Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
Diffstat (limited to 'JavaScriptCore/API')
| -rw-r--r-- | JavaScriptCore/API/JSCallbackObject.h | 5 | ||||
| -rw-r--r-- | JavaScriptCore/API/JSCallbackObjectFunctions.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/JavaScriptCore/API/JSCallbackObject.h b/JavaScriptCore/API/JSCallbackObject.h index dfb9fa2..cf42818 100644 --- a/JavaScriptCore/API/JSCallbackObject.h +++ b/JavaScriptCore/API/JSCallbackObject.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. * Copyright (C) 2007 Eric Seidel <eric@webkit.org> * * Redistribution and use in source and binary forms, with or without @@ -30,6 +30,7 @@ #include "JSObjectRef.h" #include "JSValueRef.h" #include "JSObject.h" +#include <wtf/PassOwnPtr.h> namespace JSC { @@ -56,7 +57,7 @@ struct JSCallbackObjectData { void setPrivateProperty(const Identifier& propertyName, JSValue value) { if (!m_privateProperties) - m_privateProperties.set(new JSPrivatePropertyMap); + m_privateProperties = adoptPtr(new JSPrivatePropertyMap); m_privateProperties->setPrivateProperty(propertyName, value); } diff --git a/JavaScriptCore/API/JSCallbackObjectFunctions.h b/JavaScriptCore/API/JSCallbackObjectFunctions.h index 3a15bbe..9a3e448 100644 --- a/JavaScriptCore/API/JSCallbackObjectFunctions.h +++ b/JavaScriptCore/API/JSCallbackObjectFunctions.h @@ -52,7 +52,7 @@ inline JSCallbackObject<Base>* JSCallbackObject<Base>::asCallbackObject(JSValue template <class Base> JSCallbackObject<Base>::JSCallbackObject(ExecState* exec, JSGlobalObject* globalObject, NonNullPassRefPtr<Structure> structure, JSClassRef jsClass, void* data) : Base(globalObject, structure) - , m_callbackObjectData(new JSCallbackObjectData(data, jsClass)) + , m_callbackObjectData(adoptPtr(new JSCallbackObjectData(data, jsClass))) { init(exec); } @@ -62,7 +62,7 @@ JSCallbackObject<Base>::JSCallbackObject(ExecState* exec, JSGlobalObject* global template <class Base> JSCallbackObject<Base>::JSCallbackObject(JSClassRef jsClass, NonNullPassRefPtr<Structure> structure) : Base(structure) - , m_callbackObjectData(new JSCallbackObjectData(0, jsClass)) + , m_callbackObjectData(adoptPtr(new JSCallbackObjectData(0, jsClass))) { ASSERT(Base::isGlobalObject()); init(static_cast<JSGlobalObject*>(this)->globalExec()); |