diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/bindings/js/ScriptWrappable.h | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/bindings/js/ScriptWrappable.h')
| -rw-r--r-- | Source/WebCore/bindings/js/ScriptWrappable.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/WebCore/bindings/js/ScriptWrappable.h b/Source/WebCore/bindings/js/ScriptWrappable.h index 0fbe9e4..4fef506 100644 --- a/Source/WebCore/bindings/js/ScriptWrappable.h +++ b/Source/WebCore/bindings/js/ScriptWrappable.h @@ -32,28 +32,29 @@ #define ScriptWrappable_h #include "JSDOMWrapper.h" -#include <runtime/WeakGCPtr.h> +#include <heap/Weak.h> namespace WebCore { class ScriptWrappable { public: - ScriptWrappable() + JSDOMWrapper* wrapper() const { + return m_wrapper.get(); } - DOMObject* wrapper() const + void setWrapper(JSC::JSGlobalData& globalData, JSDOMWrapper* wrapper, JSC::WeakHandleOwner* wrapperOwner, void* context) { - return m_wrapper.get(); + m_wrapper.set(globalData, wrapper, wrapperOwner, context); } - void setWrapper(JSC::JSGlobalData& globalData, DOMObject* wrapper) + void clearWrapper() { - m_wrapper.set(globalData, wrapper, 0); + m_wrapper.clear(); } private: - JSC::WeakGCPtr<DOMObject> m_wrapper; + JSC::Weak<JSDOMWrapper> m_wrapper; }; } // namespace WebCore |