Merge WebKit at r71558: Initial merge by git.

[android-x86/external-webkit.git] / WebCore / Android.derived.v8bindings.mk

diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index bbdd67d..02d7b3b 100644 (file)
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -31,7 +31,7 @@ js_binding_scripts := \
        $(LOCAL_PATH)/bindings/scripts/generate-bindings.pl
 
 # Add ACCELERATED_COMPOSITING=1 and ENABLE_3D_RENDERING=1 for layers support
-FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_DEVICE_ORIENTATION=1 ENABLE_FILE_READER=1 ENABLE_BLOB_SLICE=1
+FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_DEVICE_ORIENTATION=1 ENABLE_FILE_READER=1 ENABLE_BLOB=1
 # The defines above should be identical to those for JSC.
 FEATURE_DEFINES += V8_BINDING
 
@@ -101,6 +101,7 @@ GEN := \
     $(intermediates)/bindings/V8ErrorEvent.h \
     $(intermediates)/bindings/V8Event.h \
     $(intermediates)/bindings/V8EventException.h \
+    $(intermediates)/bindings/V8HashChangeEvent.h \
     $(intermediates)/bindings/V8KeyboardEvent.h \
     $(intermediates)/bindings/V8MessageChannel.h \
     $(intermediates)/bindings/V8MessageEvent.h \
@@ -141,17 +142,56 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
 # above rules.  Specifying this explicitly makes -j2 work.
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)/bindings/%.h
 
-# HTML
+# Fileapi
 GEN := \
     $(intermediates)/bindings/V8Blob.h \
     $(intermediates)/bindings/V8BlobBuilder.h \
-    $(intermediates)/bindings/V8DOMFormData.h \
-    $(intermediates)/bindings/V8DataGridColumn.h \
-    $(intermediates)/bindings/V8DataGridColumnList.h \
+    $(intermediates)/bindings/V8DOMFileSystem.h \
+    $(intermediates)/bindings/V8DOMFileSystemSync.h \
+    $(intermediates)/bindings/V8DirectoryEntry.h \
+    $(intermediates)/bindings/V8DirectoryEntrySync.h \
+    $(intermediates)/bindings/V8DirectoryReader.h \
+    $(intermediates)/bindings/V8DirectoryReaderSync.h \
+    $(intermediates)/bindings/V8EntriesCallback.h \
+    $(intermediates)/bindings/V8Entry.h \
+    $(intermediates)/bindings/V8EntryArray.h \
+    $(intermediates)/bindings/V8EntryArraySync.h \
+    $(intermediates)/bindings/V8EntryCallback.h \
+    $(intermediates)/bindings/V8EntrySync.h \
+    $(intermediates)/bindings/V8ErrorCallback.h \
     $(intermediates)/bindings/V8File.h \
+    $(intermediates)/bindings/V8FileCallback.h \
+    $(intermediates)/bindings/V8FileEntry.h \
+    $(intermediates)/bindings/V8FileEntrySync.h \
     $(intermediates)/bindings/V8FileError.h \
+    $(intermediates)/bindings/V8FileException.h \
     $(intermediates)/bindings/V8FileList.h \
     $(intermediates)/bindings/V8FileReader.h \
+    $(intermediates)/bindings/V8FileReaderSync.h \
+    $(intermediates)/bindings/V8FileSystemCallback.h \
+    $(intermediates)/bindings/V8FileWriter.h \
+    $(intermediates)/bindings/V8FileWriterCallback.h \
+    $(intermediates)/bindings/V8Flags.h \
+    $(intermediates)/bindings/V8Metadata.h \
+    $(intermediates)/bindings/V8MetadataCallback.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 --include fileapi --outputdir $(dir $@) $<
+$(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/fileapi/%.idl $(js_binding_scripts)
+       $(transform-generated-source)
+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)/bindings/%.cpp : $(intermediates)/bindings/%.h
+
+# HTML
+GEN := \
+    $(intermediates)/bindings/V8DOMFormData.h \
+    $(intermediates)/bindings/V8DOMSettableTokenList.h \
+    $(intermediates)/bindings/V8DOMTokenList.h \
+    $(intermediates)/bindings/V8DataGridColumn.h \
+    $(intermediates)/bindings/V8DataGridColumnList.h \
     $(intermediates)/bindings/V8HTMLAllCollection.h \
     $(intermediates)/bindings/V8HTMLAnchorElement.h \
     $(intermediates)/bindings/V8HTMLAppletElement.h \
@@ -205,6 +245,7 @@ GEN := \
     $(intermediates)/bindings/V8HTMLOptGroupElement.h \
     $(intermediates)/bindings/V8HTMLOptionElement.h \
     $(intermediates)/bindings/V8HTMLOptionsCollection.h \
+    $(intermediates)/bindings/V8HTMLOutputElement.h \
     $(intermediates)/bindings/V8HTMLParagraphElement.h \
     $(intermediates)/bindings/V8HTMLParamElement.h \
     $(intermediates)/bindings/V8HTMLPreElement.h \
@@ -244,8 +285,8 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
 # Canvas
 GEN := \
     $(intermediates)/bindings/V8ArrayBuffer.h \
+    $(intermediates)/bindings/V8ArrayBufferView.h \
     $(intermediates)/bindings/V8CanvasGradient.h \
-    $(intermediates)/bindings/V8CanvasNumberArray.h \
     $(intermediates)/bindings/V8CanvasPattern.h \
     $(intermediates)/bindings/V8CanvasPixelArray.h \
     $(intermediates)/bindings/V8CanvasRenderingContext.h \
@@ -540,7 +581,6 @@ GEN += \
     $(intermediates)/bindings/V8SVGAnimatedLengthList.h \
     $(intermediates)/bindings/V8SVGAnimatedNumber.h \
     $(intermediates)/bindings/V8SVGAnimatedNumberList.h \
-    $(intermediates)/bindings/V8SVGAnimatedPoints.h \
     $(intermediates)/bindings/V8SVGAnimatedPreserveAspectRatio.h \
     $(intermediates)/bindings/V8SVGAnimatedRect.h \
     $(intermediates)/bindings/V8SVGAnimatedString.h \