diff options
| -rw-r--r-- | V8Binding/V8Binding.derived.mk | 16 | ||||
| -rw-r--r-- | V8Binding/scripts/CodeGeneratorV8.pm | 1 | ||||
| -rw-r--r-- | V8Binding/v8/v8_index.cpp | 3 | ||||
| -rw-r--r-- | V8Binding/v8/v8_index.h | 5 |
4 files changed, 13 insertions, 12 deletions
diff --git a/V8Binding/V8Binding.derived.mk b/V8Binding/V8Binding.derived.mk index a2fe888..70dac51 100644 --- a/V8Binding/V8Binding.derived.mk +++ b/V8Binding/V8Binding.derived.mk @@ -78,17 +78,13 @@ WEBCORE_SRC_FILES := \ bindings/v8/custom/V8NodeFilterCustom.cpp \ bindings/v8/custom/V8NodeIteratorCustom.cpp \ bindings/v8/custom/V8NodeListCustom.cpp \ - -ifeq ($(ENABLE_STORAGE), true) -WEBCORE_SRC_FILES := $(WEBCORE_SRC_FILES) \ bindings/v8/custom/V8DatabaseCustom.cpp \ - bindings/v8/custom/V8SQLTransactionCustom.cpp + bindings/v8/custom/V8SQLTransactionCustom.cpp \ bindings/v8/custom/V8CustomSQLStatementCallback.cpp \ bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp \ bindings/v8/custom/V8CustomSQLTransactionCallback.cpp \ bindings/v8/custom/V8CustomSQLTransactionErrorCallback.cpp \ bindings/v8/custom/V8SQLResultSetRowListCustom.cpp -endif ifeq ($(ENABLE_SVG), true) WEBCORE_SRC_FILES := $(WEBCORE_SRC_FILES) \ @@ -141,7 +137,7 @@ js_binding_scripts := \ $(WEBCORE_PATH)/bindings/scripts/IDLStructure.pm \ $(LOCAL_PATH)/scripts/generate-bindings.pl -FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1 V8_BINDING +FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1 V8_BINDING ENABLE_DATABASE=1 GEN := \ $(intermediates)/css/V8CSSCharsetRule.h \ @@ -360,16 +356,13 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) # above rules. Specifying this explicitly makes -j2 work. $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/plugins/%.cpp : $(intermediates)/plugins/%.h -ifeq ($(ENABLE_STORAGE),true) -# Storage support +# Database support GEN := \ $(intermediates)/storage/V8Database.h \ $(intermediates)/storage/V8SQLError.h \ $(intermediates)/storage/V8SQLResultSet.h \ $(intermediates)/storage/V8SQLResultSetRowList.h \ - $(intermediates)/storage/V8SQLTransaction.h \ - $(intermediates)/storage/V8Storage.h \ - $(intermediates)/storage/V8StorageEvent.h + $(intermediates)/storage/V8SQLTransaction.h $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(WEBCORE_PATH) perl -I$(v8binding_dir)/scripts -I$(WEBCORE_PATH)/bindings/scripts $(v8binding_dir)/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $< $(GEN): $(intermediates)/storage/V8%.h : $(WEBCORE_PATH)/storage/%.idl $(js_binding_scripts) @@ -379,7 +372,6 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/storage/%.cpp : $(intermediates)/storage/%.h -endif #new section for svg ifeq ($(ENABLE_SVG), true) diff --git a/V8Binding/scripts/CodeGeneratorV8.pm b/V8Binding/scripts/CodeGeneratorV8.pm index 95935b6..ae5209d 100644 --- a/V8Binding/scripts/CodeGeneratorV8.pm +++ b/V8Binding/scripts/CodeGeneratorV8.pm @@ -1594,6 +1594,7 @@ sub IsRefPtrType return 1 if $type eq "CSSStyleDeclaration"; return 1 if $type eq "CSSValue"; return 1 if $type eq "CSSRuleList"; + return 1 if $type eq "Database"; return 1 if $type eq "Document"; return 1 if $type eq "DocumentFragment"; return 1 if $type eq "DocumentType"; 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) \ |