Merge WebKit at r61871: Update makefiles

Change-Id: I85e597beedb768af8d3cf4aa269ecdeb2af9a113

5 files changed, 8 insertions, 25 deletions

diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk
index e4199fe..ded912e 100644
--- a/JavaScriptCore/Android.mk
+++ b/JavaScriptCore/Android.mk
@@ -58,6 +58,7 @@ LOCAL_SRC_FILES := \
 	jit/JITStubs.cpp \
 	jit/ThunkGenerators.cpp \
 	\
+	parser/JSParser.cpp \
 	parser/Lexer.cpp \
 	parser/Nodes.cpp \
 	parser/Parser.cpp \
@@ -143,6 +144,7 @@ LOCAL_SRC_FILES := \
 	runtime/PropertySlot.cpp \
 	runtime/PrototypeFunction.cpp \
 	runtime/RegExp.cpp \
+	runtime/RegExpCache.cpp \
 	runtime/RegExpConstructor.cpp \
 	runtime/RegExpObject.cpp \
 	runtime/RegExpPrototype.cpp \
diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk
index a2a5c8c..130b0c4 100644
--- a/WebCore/Android.derived.jscbindings.mk
+++ b/WebCore/Android.derived.jscbindings.mk
@@ -303,6 +303,7 @@ GEN := \
     $(intermediates)/page/JSCoordinates.h \
     $(intermediates)/page/JSDOMSelection.h \
     $(intermediates)/page/JSDOMWindow.h \
+    $(intermediates)/page/JSEventSource.h \
     $(intermediates)/page/JSGeolocation.h \
     $(intermediates)/page/JSGeoposition.h \
     $(intermediates)/page/JSHistory.h \
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index d852246..b5c3ada 100644
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -142,11 +142,8 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
 # HTML
 GEN := \
     $(intermediates)/bindings/V8Blob.h \
-<<<<<<< HEAD
-    $(intermediates)/bindings/V8DOMFormData.h \
-=======
     $(intermediates)/bindings/V8BlobBuilder.h \
->>>>>>> webkit.org at r61871
+    $(intermediates)/bindings/V8DOMFormData.h \
     $(intermediates)/bindings/V8DataGridColumn.h \
     $(intermediates)/bindings/V8DataGridColumnList.h \
     $(intermediates)/bindings/V8File.h \
diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk
index 2236452..c6feb26 100644
--- a/WebCore/Android.jscbindings.mk
+++ b/WebCore/Android.jscbindings.mk
@@ -100,7 +100,6 @@ LOCAL_SRC_FILES += \
 	bindings/js/JSEventListener.cpp \
 	bindings/js/JSEventTarget.cpp \
 	bindings/js/JSExceptionBase.cpp \
-	bindings/js/JSFloat32ArrayConstructor.cpp \
 	bindings/js/JSFloat32ArrayCustom.cpp \
 	bindings/js/JSGeolocationCustom.cpp \
 	bindings/js/JSHTMLAllCollectionCustom.cpp \
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index 1b02cc4..bd6765d 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -250,13 +250,11 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	\
 	html/AsyncImageResizer.cpp \
 	html/Blob.cpp \
+	html/BlobBuilder.cpp \
 	html/CollectionCache.cpp \
-<<<<<<< HEAD
-	html/DateComponents.cpp \
-=======
 	html/CSSPreloadScanner.cpp \
->>>>>>> webkit.org at r61871
 	html/DOMFormData.cpp \
+	html/DateComponents.cpp \
 	html/File.cpp \
 	html/FileList.cpp \
 	html/FileReader.cpp \
@@ -266,7 +264,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	html/FormDataList.cpp \
 	html/HTMLEntityParser.cpp \
 	html/HTMLTokenizer.cpp \
-	html/HTMLDocumentParser.cpp \
 	html/HTMLPreloadScanner.cpp \
 	html/HTMLScriptRunner.cpp \
 	html/HTMLTreeBuilder.cpp \
@@ -280,28 +277,17 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	html/HTMLImageLoader.cpp \
 	html/HTMLNameCollection.cpp \
 	html/HTMLOptionsCollection.cpp \
-<<<<<<< HEAD
-=======
-	html/LegacyHTMLTreeBuilder.cpp \
->>>>>>> webkit.org at r61871
 	html/HTMLParserErrorCodes.cpp \
 	html/HTMLParserScheduler.cpp \
 	html/HTMLTableRowsCollection.cpp \
-<<<<<<< HEAD
 	html/HTMLViewSourceDocument.cpp \
 	html/ImageData.cpp \
 	html/ImageResizerThread.cpp \
 	html/LabelsNodeList.cpp \
-	html/LegacyHTMLTreeConstructor.cpp \
-	html/PreloadScanner.cpp \
+	html/LegacyHTMLTreeBuilder.cpp \
 	html/StepRange.cpp \
-=======
 	html/LegacyHTMLDocumentParser.cpp \
-	html/HTMLViewSourceDocument.cpp \
-	html/ImageData.cpp \
-	html/ImageResizerThread.cpp \
 	html/LegacyPreloadScanner.cpp \
->>>>>>> webkit.org at r61871
 	html/TimeRanges.cpp \
 	html/ValidityState.cpp \
 	\
@@ -349,11 +335,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	loader/Request.cpp \
 	loader/ResourceLoadNotifier.cpp \
 	loader/ResourceLoader.cpp \
-<<<<<<< HEAD
 	loader/SinkDocument.cpp \
-=======
 	loader/SubframeLoader.cpp \
->>>>>>> webkit.org at r61871
 	loader/SubresourceLoader.cpp \
 	loader/TextDocument.cpp \
 	loader/TextResourceDecoder.cpp \
@@ -795,6 +778,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	rendering/style/StyleTransformData.cpp \
 	rendering/style/StyleVisualData.cpp \
 	\
+	storage/AbstractDatabase.cpp \
 	storage/ChangeVersionWrapper.cpp \
 	storage/Database.cpp \
 	storage/DatabaseAuthorizer.cpp \