diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-05 12:14:08 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-05 12:14:08 -0700 |
| commit | 4e58e4a9680838b42218f11f8270f8df4f5ca403 (patch) | |
| tree | 444dcba8833737d7e2a474bfb01390c9f8a9873d /V8Binding/v8 | |
| parent | a7688f95baf2b81da0f3c9c61cbe53439ae21601 (diff) | |
| parent | 83f34b474a05b73f11f91f4ef806340b542ce7b9 (diff) | |
| download | external_webkit-4e58e4a9680838b42218f11f8270f8df4f5ca403.zip external_webkit-4e58e4a9680838b42218f11f8270f8df4f5ca403.tar.gz external_webkit-4e58e4a9680838b42218f11f8270f8df4f5ca403.tar.bz2 | |
Merge change 982
* changes:
Enable Database API V8 bindings.
Diffstat (limited to 'V8Binding/v8')
| -rw-r--r-- | V8Binding/v8/v8_index.cpp | 3 | ||||
| -rw-r--r-- | V8Binding/v8/v8_index.h | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/V8Binding/v8/v8_index.cpp b/V8Binding/v8/v8_index.cpp index 1078847..fcc75e9 100644 --- a/V8Binding/v8/v8_index.cpp +++ b/V8Binding/v8/v8_index.cpp @@ -204,6 +204,9 @@ #if PLATFORM(CHROMIUM) #include "V8InspectorController.h" +#endif + +#if PLATFORM(CHROMIUM) || ENABLE(DATABASE) #include "V8Database.h" #include "V8SQLError.h" #include "V8SQLResultSet.h" diff --git a/V8Binding/v8/v8_index.h b/V8Binding/v8/v8_index.h index ae32ba2..b8d76ed 100644 --- a/V8Binding/v8/v8_index.h +++ b/V8Binding/v8/v8_index.h @@ -338,12 +338,16 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); V(XPATHNSRESOLVER, XPathNSResolver) \ V(XPATHRESULT, XPathResult) +#if ENABLE(DATABASE) #define DOM_OBJECT_DATABASE_TYPES(V) \ V(DATABASE, Database) \ V(SQLERROR, SQLError) \ V(SQLRESULTSET, SQLResultSet) \ V(SQLRESULTSETROWLIST, SQLResultSetRowList) \ V(SQLTRANSACTION, SQLTransaction) +#else +#define DOM_OBJECT_DATABASE_TYPES(V) +#endif #if PLATFORM(CHROMIUM) #define DOM_OBJECT_TYPES(V) \ @@ -359,6 +363,7 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); #define DOM_OBJECT_TYPES(V) \ DOM_OBJECT_TYPES_1(V) \ DOM_OBJECT_TYPES_2(V) \ + DOM_OBJECT_DATABASE_TYPES(V) \ V(COORDINATES, Coordinates) \ V(GEOLOCATION, Geolocation) \ V(GEOPOSITION, Geoposition) \ |