diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/JavaScriptCore/runtime/JSAPIValueWrapper.h | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/JavaScriptCore/runtime/JSAPIValueWrapper.h')
-rw-r--r-- | Source/JavaScriptCore/runtime/JSAPIValueWrapper.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/runtime/JSAPIValueWrapper.h b/Source/JavaScriptCore/runtime/JSAPIValueWrapper.h index 10ded4c..a113e91 100644 --- a/Source/JavaScriptCore/runtime/JSAPIValueWrapper.h +++ b/Source/JavaScriptCore/runtime/JSAPIValueWrapper.h @@ -31,7 +31,7 @@ namespace JSC { class JSAPIValueWrapper : public JSCell { friend JSValue jsAPIValueWrapper(ExecState*, JSValue); public: - JSValue value() const { return m_value; } + JSValue value() const { return m_value.get(); } virtual bool isAPIValueWrapper() const { return true; } @@ -44,12 +44,12 @@ namespace JSC { private: JSAPIValueWrapper(ExecState* exec, JSValue value) : JSCell(exec->globalData().apiWrapperStructure.get()) - , m_value(value) { + m_value.set(exec->globalData(), this, value); ASSERT(!value.isCell()); } - JSValue m_value; + WriteBarrier<Unknown> m_value; }; inline JSValue jsAPIValueWrapper(ExecState* exec, JSValue value) |