diff options
author | Steve Block <steveblock@google.com> | 2009-10-08 17:19:54 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:58 +0100 |
commit | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (patch) | |
tree | a6c7e2d6cd7bfa7011cc39abbb436142d7a4a7c8 /WebCore/bindings/js/JSCustomSQLStatementCallback.h | |
parent | e196732677050bd463301566a68a643b6d14b907 (diff) | |
download | external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.zip external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.gz external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.bz2 |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
Diffstat (limited to 'WebCore/bindings/js/JSCustomSQLStatementCallback.h')
-rw-r--r-- | WebCore/bindings/js/JSCustomSQLStatementCallback.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/WebCore/bindings/js/JSCustomSQLStatementCallback.h b/WebCore/bindings/js/JSCustomSQLStatementCallback.h index c380670..259aecf 100644 --- a/WebCore/bindings/js/JSCustomSQLStatementCallback.h +++ b/WebCore/bindings/js/JSCustomSQLStatementCallback.h @@ -31,32 +31,29 @@ #if ENABLE(DATABASE) +#include "JSCallbackData.h" #include "SQLStatementCallback.h" - -#include <runtime/JSObject.h> -#include <runtime/Protect.h> #include <wtf/Forward.h> -namespace JSC { - class JSObject; -} - namespace WebCore { -class Frame; class SQLResultSet; class JSCustomSQLStatementCallback : public SQLStatementCallback { public: - static PassRefPtr<JSCustomSQLStatementCallback> create(JSC::JSObject* callback, Frame* frame) { return adoptRef(new JSCustomSQLStatementCallback(callback, frame)); } + static PassRefPtr<JSCustomSQLStatementCallback> create(JSC::JSObject* callback, JSDOMGlobalObject* globalObject) + { + return adoptRef(new JSCustomSQLStatementCallback(callback, globalObject)); + } + + virtual ~JSCustomSQLStatementCallback(); virtual void handleEvent(SQLTransaction*, SQLResultSet*, bool& raisedException); private: - JSCustomSQLStatementCallback(JSC::JSObject* callback, Frame*); + JSCustomSQLStatementCallback(JSC::JSObject* callback, JSDOMGlobalObject*); - JSC::ProtectedPtr<JSC::JSObject> m_callback; - RefPtr<Frame> m_frame; + JSCallbackData* m_data; }; } |