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/JSCallbackData.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/JSCallbackData.h')
| -rw-r--r-- | Source/WebCore/bindings/js/JSCallbackData.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/bindings/js/JSCallbackData.h b/Source/WebCore/bindings/js/JSCallbackData.h index 942cd9c..94ca48d 100644 --- a/Source/WebCore/bindings/js/JSCallbackData.h +++ b/Source/WebCore/bindings/js/JSCallbackData.h @@ -32,7 +32,7 @@ #include "JSDOMBinding.h" #include "JSDOMGlobalObject.h" #include "ScriptExecutionContext.h" -#include <collector/handles/Global.h> +#include <heap/Strong.h> #include <runtime/JSObject.h> #include <wtf/Threading.h> @@ -66,8 +66,8 @@ public: JSC::JSValue invokeCallback(JSC::MarkedArgumentBuffer&, bool* raisedException = 0); private: - JSC::Global<JSC::JSObject> m_callback; - JSC::Global<JSDOMGlobalObject> m_globalObject; + JSC::Strong<JSC::JSObject> m_callback; + JSC::Strong<JSDOMGlobalObject> m_globalObject; #ifndef NDEBUG ThreadIdentifier m_thread; #endif |