diff options
author | Ben Murdoch <benm@google.com> | 2009-05-13 17:58:43 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2009-05-15 11:38:01 +0100 |
commit | 8ccf722629b08f2a06b2cadbdc3d0c9dc885e25d (patch) | |
tree | ad83ccc3e517a60955ebedbfc855a4a97558f508 /WebCore/bindings/v8/custom | |
parent | 8fe05189c51b0ae29ba6f8c9d4c86fa288110707 (diff) | |
download | external_webkit-8ccf722629b08f2a06b2cadbdc3d0c9dc885e25d.zip external_webkit-8ccf722629b08f2a06b2cadbdc3d0c9dc885e25d.tar.gz external_webkit-8ccf722629b08f2a06b2cadbdc3d0c9dc885e25d.tar.bz2 |
Apply fixes for webkit bugs 24776 and 25616 to add ENABLE(DATABASE) guards. This makes the macro work, so ENABLE_DATABASE can be toggled in config.h and the JavaScriptCore.derived.mk or V8Bindings.derived.mk.
Diffstat (limited to 'WebCore/bindings/v8/custom')
11 files changed, 55 insertions, 0 deletions
diff --git a/WebCore/bindings/v8/custom/V8CustomSQLStatementCallback.cpp b/WebCore/bindings/v8/custom/V8CustomSQLStatementCallback.cpp index bf07416..a277027 100644 --- a/WebCore/bindings/v8/custom/V8CustomSQLStatementCallback.cpp +++ b/WebCore/bindings/v8/custom/V8CustomSQLStatementCallback.cpp @@ -29,6 +29,9 @@ */ #include "config.h" + +#if ENABLE(DATABASE) + #include "V8CustomSQLStatementCallback.h" #include "Frame.h" @@ -70,3 +73,6 @@ void V8CustomSQLStatementCallback::handleEvent(SQLTransaction* transaction, SQLR } } // namespace WebCore + +#endif + diff --git a/WebCore/bindings/v8/custom/V8CustomSQLStatementCallback.h b/WebCore/bindings/v8/custom/V8CustomSQLStatementCallback.h index 5c4b368..58ee943 100644 --- a/WebCore/bindings/v8/custom/V8CustomSQLStatementCallback.h +++ b/WebCore/bindings/v8/custom/V8CustomSQLStatementCallback.h @@ -31,6 +31,8 @@ #ifndef V8CustomSQLStatementCallback_h #define V8CustomSQLStatementCallback_h +#if ENABLE(DATABASE) + #include "SQLStatementCallback.h" #include <v8.h> #include <wtf/PassRefPtr.h> @@ -59,4 +61,6 @@ private: } // namespace WebCore +#endif + #endif // V8CustomSQLStatementCallback_h diff --git a/WebCore/bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp b/WebCore/bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp index 908d21c..2f4401f 100644 --- a/WebCore/bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp +++ b/WebCore/bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp @@ -29,6 +29,9 @@ */ #include "config.h" + +#if ENABLE(DATABASE) + #include "V8CustomSQLStatementErrorCallback.h" #include "Frame.h" @@ -74,3 +77,6 @@ bool V8CustomSQLStatementErrorCallback::handleEvent(SQLTransaction* transaction, } } // namespace WebCore + +#endif + diff --git a/WebCore/bindings/v8/custom/V8CustomSQLStatementErrorCallback.h b/WebCore/bindings/v8/custom/V8CustomSQLStatementErrorCallback.h index 7dc8114..685efc6 100644 --- a/WebCore/bindings/v8/custom/V8CustomSQLStatementErrorCallback.h +++ b/WebCore/bindings/v8/custom/V8CustomSQLStatementErrorCallback.h @@ -31,6 +31,8 @@ #ifndef V8CustomSQLStatementErrorCallback_h #define V8CustomSQLStatementErrorCallback_h +#if ENABLE(DATABASE) + #include "SQLStatementErrorCallback.h" #include "SQLStatementErrorCallback.h" @@ -61,4 +63,6 @@ private: } // namespace WebCore +#endif + #endif // V8CustomSQLStatementErrorCallback_h diff --git a/WebCore/bindings/v8/custom/V8CustomSQLTransactionCallback.cpp b/WebCore/bindings/v8/custom/V8CustomSQLTransactionCallback.cpp index a45f3c9..a175df5 100644 --- a/WebCore/bindings/v8/custom/V8CustomSQLTransactionCallback.cpp +++ b/WebCore/bindings/v8/custom/V8CustomSQLTransactionCallback.cpp @@ -29,6 +29,9 @@ */ #include "config.h" + +#if ENABLE(DATABASE) + #include "V8CustomSQLTransactionCallback.h" #include "Frame.h" @@ -73,3 +76,6 @@ void V8CustomSQLTransactionCallback::handleEvent(SQLTransaction* transaction, bo } } // namespace WebCore + +#endif + diff --git a/WebCore/bindings/v8/custom/V8CustomSQLTransactionCallback.h b/WebCore/bindings/v8/custom/V8CustomSQLTransactionCallback.h index 35497e0..665404d 100644 --- a/WebCore/bindings/v8/custom/V8CustomSQLTransactionCallback.h +++ b/WebCore/bindings/v8/custom/V8CustomSQLTransactionCallback.h @@ -31,6 +31,8 @@ #ifndef V8CustomSQLTransactionCallback_h #define V8CustomSQLTransactionCallback_h +#if ENABLE(DATABASE) + #include "SQLTransactionCallback.h" #include <v8.h> #include <wtf/PassRefPtr.h> @@ -59,4 +61,6 @@ private: } // namespace WebCore +#endif + #endif // V8CustomSQLTransactionCallback_h diff --git a/WebCore/bindings/v8/custom/V8CustomSQLTransactionErrorCallback.cpp b/WebCore/bindings/v8/custom/V8CustomSQLTransactionErrorCallback.cpp index f1ad740..5333006 100644 --- a/WebCore/bindings/v8/custom/V8CustomSQLTransactionErrorCallback.cpp +++ b/WebCore/bindings/v8/custom/V8CustomSQLTransactionErrorCallback.cpp @@ -29,6 +29,9 @@ */ #include "config.h" + +#if ENABLE(DATABASE) + #include "V8CustomSQLTransactionErrorCallback.h" #include "Frame.h" @@ -73,3 +76,6 @@ bool V8CustomSQLTransactionErrorCallback::handleEvent(SQLError* error) } } // namespace WebCore + +#endif + diff --git a/WebCore/bindings/v8/custom/V8CustomSQLTransactionErrorCallback.h b/WebCore/bindings/v8/custom/V8CustomSQLTransactionErrorCallback.h index bbf5a749..13e8178 100644 --- a/WebCore/bindings/v8/custom/V8CustomSQLTransactionErrorCallback.h +++ b/WebCore/bindings/v8/custom/V8CustomSQLTransactionErrorCallback.h @@ -31,6 +31,8 @@ #ifndef V8CustomSQLTransactionErrorCallback_h #define V8CustomSQLTransactionErrorCallback_h +#if ENABLE(DATABASE) + #include "SQLTransactionErrorCallback.h" #include <v8.h> #include <wtf/PassRefPtr.h> @@ -60,4 +62,6 @@ private: } // namespace WebCore +#endif + #endif // V8CustomSQLTransactionErrorCallback_h diff --git a/WebCore/bindings/v8/custom/V8DatabaseCustom.cpp b/WebCore/bindings/v8/custom/V8DatabaseCustom.cpp index 5962ea3..2581d46 100644 --- a/WebCore/bindings/v8/custom/V8DatabaseCustom.cpp +++ b/WebCore/bindings/v8/custom/V8DatabaseCustom.cpp @@ -30,6 +30,8 @@ #include "config.h" +#if ENABLE(DATABASE) + #include "v8_binding.h" #include "v8_custom.h" #include "v8_proxy.h" @@ -91,3 +93,6 @@ CALLBACK_FUNC_DECL(DatabaseTransaction) } } // namespace WebCore + +#endif + diff --git a/WebCore/bindings/v8/custom/V8SQLResultSetRowListCustom.cpp b/WebCore/bindings/v8/custom/V8SQLResultSetRowListCustom.cpp index 66585be..2481a4f 100644 --- a/WebCore/bindings/v8/custom/V8SQLResultSetRowListCustom.cpp +++ b/WebCore/bindings/v8/custom/V8SQLResultSetRowListCustom.cpp @@ -30,6 +30,8 @@ #include "config.h" +#if ENABLE(DATABASE) + #include "v8_binding.h" #include "v8_custom.h" #include "v8_proxy.h" @@ -88,3 +90,6 @@ CALLBACK_FUNC_DECL(SQLResultSetRowListItem) } } // namespace WebCore + +#endif + diff --git a/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp b/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp index 3ca797c..fca60a0 100644 --- a/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp +++ b/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp @@ -30,6 +30,8 @@ #include "config.h" +#if ENABLE(DATABASE) + #include "v8_binding.h" #include "v8_custom.h" #include "v8_proxy.h" @@ -112,3 +114,6 @@ CALLBACK_FUNC_DECL(SQLTransactionExecuteSql) } } // namespace WebCore + +#endif + |