From 29f0a62964e6adec9e96e568d68e1605072d06f4 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 12 May 2010 11:02:25 +0100 Subject: Merge Webkit at r58956: Update Android makefiles. Change-Id: Ie3bcd0e3d0363ad5fdfa26e275af3cca5f147ca2 --- WebCore/Android.derived.jscbindings.mk | 7 ++++++- WebCore/Android.derived.v8bindings.mk | 7 ++++++- WebCore/Android.jscbindings.mk | 4 ---- WebCore/Android.mk | 5 ++++- WebCore/Android.v8bindings.mk | 7 ------- 5 files changed, 16 insertions(+), 14 deletions(-) (limited to 'WebCore') diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk index 47d70e2..5ac411a 100644 --- a/WebCore/Android.derived.jscbindings.mk +++ b/WebCore/Android.derived.jscbindings.mk @@ -337,10 +337,15 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/plugins/%.cpp : $(intermediates)/ # Database GEN := \ $(intermediates)/storage/JSDatabase.h \ + $(intermediates)/storage/JSDatabaseCallback.h \ $(intermediates)/storage/JSSQLError.h \ $(intermediates)/storage/JSSQLResultSet.h \ $(intermediates)/storage/JSSQLResultSetRowList.h \ - $(intermediates)/storage/JSSQLTransaction.h + $(intermediates)/storage/JSSQLStatementCallback.h \ + $(intermediates)/storage/JSSQLStatementErrorCallback.h \ + $(intermediates)/storage/JSSQLTransaction.h \ + $(intermediates)/storage/JSSQLTransactionCallback.h \ + $(intermediates)/storage/JSSQLTransactionErrorCallback.h $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk index 0cc1f96..63eab66 100644 --- a/WebCore/Android.derived.v8bindings.mk +++ b/WebCore/Android.derived.v8bindings.mk @@ -332,10 +332,15 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates) # Database GEN := \ $(intermediates)/bindings/V8Database.h \ + $(intermediates)/bindings/V8DatabaseCallback.h \ $(intermediates)/bindings/V8SQLError.h \ $(intermediates)/bindings/V8SQLResultSet.h \ $(intermediates)/bindings/V8SQLResultSetRowList.h \ - $(intermediates)/bindings/V8SQLTransaction.h + $(intermediates)/bindings/V8SQLStatementCallback.h \ + $(intermediates)/bindings/V8SQLStatementErrorCallback.h \ + $(intermediates)/bindings/V8SQLTransaction.h \ + $(intermediates)/bindings/V8SQLTransactionCallback.h \ + $(intermediates)/bindings/V8SQLTransactionErrorCallback.h $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $< diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk index c768fae..ceb1f66 100644 --- a/WebCore/Android.jscbindings.mk +++ b/WebCore/Android.jscbindings.mk @@ -78,12 +78,8 @@ LOCAL_SRC_FILES += \ bindings/js/JSCustomApplicationInstalledCallback.cpp \ bindings/js/JSCustomPositionCallback.cpp \ bindings/js/JSCustomPositionErrorCallback.cpp \ - bindings/js/JSCustomSQLStatementCallback.cpp \ bindings/js/JSCustomSQLStatementErrorCallback.cpp \ - bindings/js/JSCustomSQLTransactionCallback.cpp \ - bindings/js/JSCustomSQLTransactionErrorCallback.cpp \ bindings/js/JSCustomVoidCallback.cpp \ - bindings/js/JSDatabaseCallback.cpp \ bindings/js/JSDesktopNotificationsCustom.cpp \ bindings/js/JSDOMApplicationCacheCustom.cpp \ bindings/js/JSDOMBinding.cpp \ diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 7ad7005..4abc603 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -70,7 +70,6 @@ LOCAL_SRC_FILES := \ css/CSSVariablesRule.cpp \ css/FontFamilyValue.cpp \ css/FontValue.cpp \ - css/Media.cpp \ css/MediaFeatureNames.cpp \ css/MediaList.cpp \ css/MediaQuery.cpp \ @@ -89,6 +88,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ css/ShadowValue.cpp \ css/StyleBase.cpp \ css/StyleList.cpp \ + css/StyleMedia.cpp \ css/StyleSheet.cpp \ css/StyleSheetList.cpp \ css/WebKitCSSKeyframeRule.cpp \ @@ -251,6 +251,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ html/DOMFormData.cpp \ html/File.cpp \ html/FileList.cpp \ + html/FileReader.cpp \ html/FormDataList.cpp \ html/HTMLAllCollection.cpp \ html/HTMLCollection.cpp \ @@ -745,6 +746,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ storage/ChangeVersionWrapper.cpp \ storage/Database.cpp \ storage/DatabaseAuthorizer.cpp \ + storage/DatabaseSync.cpp \ storage/DatabaseTask.cpp \ storage/DatabaseThread.cpp \ storage/DatabaseTracker.cpp \ @@ -758,6 +760,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ storage/SQLTransaction.cpp \ storage/SQLTransactionClient.cpp \ storage/SQLTransactionCoordinator.cpp \ + storage/SQLTransactionSync.cpp \ storage/Storage.cpp \ storage/StorageAreaImpl.cpp \ storage/StorageAreaSync.cpp \ diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk index 9d26939..7f9b6ae 100644 --- a/WebCore/Android.v8bindings.mk +++ b/WebCore/Android.v8bindings.mk @@ -110,15 +110,11 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8CustomEventListener.cpp \ bindings/v8/custom/V8CustomPositionCallback.cpp \ bindings/v8/custom/V8CustomPositionErrorCallback.cpp \ - bindings/v8/custom/V8CustomSQLStatementCallback.cpp \ bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp \ - bindings/v8/custom/V8CustomSQLTransactionCallback.cpp \ - bindings/v8/custom/V8CustomSQLTransactionErrorCallback.cpp \ bindings/v8/custom/V8CustomVoidCallback.cpp \ bindings/v8/custom/V8DOMFormDataCustom.cpp \ bindings/v8/custom/V8DOMWindowCustom.cpp \ bindings/v8/custom/V8DataGridColumnListCustom.cpp \ - bindings/v8/custom/V8DatabaseCallback.cpp \ bindings/v8/custom/V8DatabaseCustom.cpp \ bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp \ bindings/v8/custom/V8DocumentCustom.cpp \ @@ -153,8 +149,6 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8NamedNodesCollection.cpp \ bindings/v8/custom/V8NavigatorCustom.cpp \ bindings/v8/custom/V8NodeCustom.cpp \ - bindings/v8/custom/V8NodeFilterCustom.cpp \ - bindings/v8/custom/V8NodeIteratorCustom.cpp \ bindings/v8/custom/V8NodeListCustom.cpp \ bindings/v8/custom/V8PopStateEventCustom.cpp \ bindings/v8/custom/V8SQLResultSetRowListCustom.cpp \ @@ -175,7 +169,6 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8StorageCustom.cpp \ bindings/v8/custom/V8StyleSheetCustom.cpp \ bindings/v8/custom/V8StyleSheetListCustom.cpp \ - bindings/v8/custom/V8TreeWalkerCustom.cpp \ bindings/v8/custom/V8WebKitCSSMatrixConstructor.cpp \ bindings/v8/custom/V8WebKitPointConstructor.cpp \ bindings/v8/custom/V8WorkerContextCustom.cpp \ -- cgit v1.1