Merge Webkit at r66666 : Fix makefiles, including some conflicts.

Change-Id: Ia903fa56d31594944939f03d0b8dec021f7964bb

6 files changed, 47 insertions, 49 deletions

diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk
index 94ed500..e9d5b15 100644
--- a/WebCore/Android.derived.jscbindings.mk
+++ b/WebCore/Android.derived.jscbindings.mk
@@ -157,17 +157,29 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
 # above rules.  Specifying this explicitly makes -j2 work.
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/dom/%.cpp : $(intermediates)/dom/%.h
 
+# Fileapi
+GEN := \
+	$(intermediates)/fileapi/JSBlob.h \
+	$(intermediates)/fileapi/JSBlobBuilder.h \
+	$(intermediates)/fileapi/JSFile.h \
+	$(intermediates)/fileapi/JSFileError.h \
+	$(intermediates)/fileapi/JSFileList.h \
+	$(intermediates)/fileapi/JSFileReader.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 --include fileapi --outputdir $(dir $@) $<
+$(GEN): $(intermediates)/fileapi/JS%.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)/fileapi/%.cpp : $(intermediates)/fileapi/%.h
+
 # HTML
 GEN := \
-    $(intermediates)/html/JSBlob.h \
-    $(intermediates)/html/JSBlobBuilder.h \
     $(intermediates)/html/JSDOMFormData.h \
     $(intermediates)/html/JSDataGridColumn.h \
     $(intermediates)/html/JSDataGridColumnList.h \
-    $(intermediates)/html/JSFile.h \
-    $(intermediates)/html/JSFileError.h \
-    $(intermediates)/html/JSFileList.h \
-    $(intermediates)/html/JSFileReader.h \
     $(intermediates)/html/JSHTMLAllCollection.h \
     $(intermediates)/html/JSHTMLAnchorElement.h \
     $(intermediates)/html/JSHTMLAppletElement.h \
diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk
index de36334..e913a48 100644
--- a/WebCore/Android.derived.mk
+++ b/WebCore/Android.derived.mk
@@ -67,14 +67,13 @@ $(GEN): $(LOCAL_PATH)/html/DocTypeStrings.gperf
 $(intermediates)/html/HTMLDocument.o : $(GEN)
 
 
-<<<<<<< HEAD
 # HTML entity table
 
 GEN := $(intermediates)/html/HTMLEntityTable.cpp
-$(GEN): SCRIPT := $(LOCAL_PATH)/../WebKitTools/Scripts/create-html-entity-table
+$(GEN): SCRIPT := $(LOCAL_PATH)/../WebCore/html/parser/create-html-entity-table
 $(GEN): WEBKITPY_RESOURCES_DIRECTORY := $(LOCAL_PATH)/../WebKitTools/Scripts/webkitpy
 $(GEN): PRIVATE_CUSTOM_TOOL = $(dir $@)$(notdir $(SCRIPT)) -o $@ $<
-$(GEN): $(LOCAL_PATH)/html/HTMLEntityNames.json
+$(GEN): $(LOCAL_PATH)/html/parser/HTMLEntityNames.in
 	@echo "Generating HTMLEntityTable.cpp"
 	@mkdir -p $(dir $@)
 	@cp -f $(SCRIPT) $(dir $@)
@@ -83,8 +82,6 @@ $(GEN): $(LOCAL_PATH)/html/HTMLEntityNames.json
 LOCAL_GENERATED_SOURCES += $(GEN)
 
 
-=======
->>>>>>> webkit.org at r66666
 # color names
 
 GEN := $(intermediates)/platform/ColorData.cpp
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index d1d737b..047aaad 100644
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -141,17 +141,30 @@ 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/V8File.h \
     $(intermediates)/bindings/V8FileError.h \
     $(intermediates)/bindings/V8FileList.h \
-    $(intermediates)/bindings/V8FileReader.h \
+    $(intermediates)/bindings/V8FileReader.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/V8DataGridColumn.h \
+    $(intermediates)/bindings/V8DataGridColumnList.h \
     $(intermediates)/bindings/V8HTMLAllCollection.h \
     $(intermediates)/bindings/V8HTMLAnchorElement.h \
     $(intermediates)/bindings/V8HTMLAppletElement.h \
diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk
index 74e7350..4e90047 100644
--- a/WebCore/Android.jscbindings.mk
+++ b/WebCore/Android.jscbindings.mk
@@ -47,6 +47,7 @@ BINDING_C_INCLUDES := \
 	\
 	$(base_intermediates)/WebCore/bindings/js \
 	$(base_intermediates)/WebCore/dom \
+	$(base_intermediates)/WebCore/fileapi \
 	$(base_intermediates)/WebCore/html/canvas \
 	$(base_intermediates)/WebCore/inspector \
 	$(base_intermediates)/WebCore/loader/appcache \
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index 622318a..7638798 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -254,18 +254,18 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	editing/markup.cpp \
 	editing/visible_units.cpp \
 	\
-<<<<<<< HEAD
-	history/BackForwardController.cpp \
-	history/BackForwardListImpl.cpp \
-=======
 	fileapi/Blob.cpp \
+	fileapi/BlobBuilder.cpp \
 	fileapi/BlobURL.cpp \
 	fileapi/File.cpp \
 	fileapi/FileList.cpp \
+	fileapi/FileReader.cpp \
+	fileapi/FileStreamProxy.cpp \
+	fileapi/FileThread.cpp \
 	fileapi/ThreadableBlobRegistry.cpp \
     \
-	history/BackForwardList.cpp \
->>>>>>> webkit.org at r66666
+	history/BackForwardController.cpp \
+	history/BackForwardListImpl.cpp \
 	history/CachedFrame.cpp \
 	history/CachedPage.cpp \
 	history/HistoryItem.cpp \
@@ -274,37 +274,15 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	history/android/HistoryItemAndroid.cpp \
 	\
 	html/AsyncImageResizer.cpp \
-<<<<<<< HEAD
-	html/Blob.cpp \
-	html/BlobBuilder.cpp \
-	html/BlobURL.cpp \
-=======
->>>>>>> webkit.org at r66666
 	html/CollectionCache.cpp \
 	html/parser/CSSPreloadScanner.cpp \
 	html/DOMFormData.cpp \
-<<<<<<< HEAD
 	html/DateComponents.cpp \
-	html/File.cpp \
-	html/FileList.cpp \
-	html/FileReader.cpp \
-	html/FileStreamProxy.cpp \
-	html/FileThread.cpp \
-	html/FormDataList.cpp \
-	html/HTMLEntityParser.cpp \
-	html/HTMLEntitySearch.cpp \
-	html/HTMLTokenizer.cpp \
-	html/HTMLPreloadScanner.cpp \
-	html/HTMLScriptRunner.cpp \
-	html/HTMLTreeBuilder.cpp \
-=======
 	html/FormDataList.cpp \
->>>>>>> webkit.org at r66666
 	html/HTMLAllCollection.cpp \
 	html/HTMLCollection.cpp \
 	html/HTMLDataListElement.cpp \
 	html/HTMLDocument.cpp \
-	html/HTMLDocumentParser.cpp \
 	html/HTMLElementsAllInOne.cpp \
 	html/HTMLFormCollection.cpp \
 	html/HTMLImageLoader.cpp \
@@ -315,12 +293,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	html/HTMLViewSourceDocument.cpp \
 	html/ImageData.cpp \
 	html/ImageResizerThread.cpp \
-<<<<<<< HEAD
 	html/LabelsNodeList.cpp \
 	html/StepRange.cpp \
-	html/ThreadableBlobRegistry.cpp \
-=======
->>>>>>> webkit.org at r66666
 	html/TimeRanges.cpp \
 	html/ValidityState.cpp \
 	\
@@ -337,6 +311,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	html/parser/HTMLDocumentParser.cpp \
 	html/parser/HTMLElementStack.cpp \
 	html/parser/HTMLEntityParser.cpp \
+	html/parser/HTMLEntitySearch.cpp \
 	html/parser/HTMLFormattingElementList.cpp \
 	html/parser/HTMLParserScheduler.cpp \
 	html/parser/HTMLPreloadScanner.cpp \
@@ -456,7 +431,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	page/animation/KeyframeAnimation.cpp \
 	\
 	platform/Arena.cpp \
-	platform/BlobItem.cpp \
 	platform/ContentType.cpp \
 	platform/ContextMenu.cpp \
 	platform/CrossThreadCopier.cpp \
diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk
index 7ac9111..c39e805 100644
--- a/WebCore/Android.v8bindings.mk
+++ b/WebCore/Android.v8bindings.mk
@@ -111,6 +111,7 @@ LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp \
 	bindings/v8/custom/V8CustomVoidCallback.cpp \
 	bindings/v8/custom/V8DOMFormDataCustom.cpp \
+	bindings/v8/custom/V8DOMStringMapCustom.cpp \
 	bindings/v8/custom/V8DOMWindowCustom.cpp \
 	bindings/v8/custom/V8DataGridColumnListCustom.cpp \
 	bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp \