From 2fc2651226baac27029e38c9d6ef883fa32084db Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 18 May 2011 13:36:51 +0100 Subject: Merge WebKit at r78450: Initial merge by git. Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1 --- Source/JavaScriptCore/runtime/JSWrapperObject.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Source/JavaScriptCore/runtime/JSWrapperObject.h') diff --git a/Source/JavaScriptCore/runtime/JSWrapperObject.h b/Source/JavaScriptCore/runtime/JSWrapperObject.h index f19cd30..0b0d3fd 100644 --- a/Source/JavaScriptCore/runtime/JSWrapperObject.h +++ b/Source/JavaScriptCore/runtime/JSWrapperObject.h @@ -30,11 +30,11 @@ namespace JSC { // Number, Boolean and Date which are wrappers for primitive types. class JSWrapperObject : public JSObject { protected: - explicit JSWrapperObject(NonNullPassRefPtr); + explicit JSWrapperObject(JSGlobalData&, NonNullPassRefPtr); public: - JSValue internalValue() const { return m_internalValue; } - void setInternalValue(JSValue); + JSValue internalValue() const { return m_internalValue.get(); } + void setInternalValue(JSGlobalData&, JSValue); static PassRefPtr createStructure(JSValue prototype) { @@ -47,21 +47,21 @@ namespace JSC { private: virtual void markChildren(MarkStack&); - JSValue m_internalValue; + WriteBarrier m_internalValue; }; - inline JSWrapperObject::JSWrapperObject(NonNullPassRefPtr structure) + inline JSWrapperObject::JSWrapperObject(JSGlobalData& globalData, NonNullPassRefPtr structure) : JSObject(structure) { - putAnonymousValue(0, jsNull()); + putAnonymousValue(globalData, 0, jsNull()); } - inline void JSWrapperObject::setInternalValue(JSValue value) + inline void JSWrapperObject::setInternalValue(JSGlobalData& globalData, JSValue value) { ASSERT(value); ASSERT(!value.isObject()); - m_internalValue = value; - putAnonymousValue(0, value); + m_internalValue.set(globalData, this, value); + putAnonymousValue(globalData, 0, value); } } // namespace JSC -- cgit v1.1