Merge Webkit at r70209: Fix Makefiles.

Change-Id: Ib60d9a927bad38e128765e122e86bcc547a785cf

5 files changed, 103 insertions, 20 deletions

diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk
index 5dd03df..080ad2d 100644
--- a/WebCore/Android.derived.jscbindings.mk
+++ b/WebCore/Android.derived.jscbindings.mk
@@ -160,12 +160,37 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/dom/%.cpp : $(intermediates)/dom/
 
 # 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
+    $(intermediates)/fileapi/JSBlob.h \
+    $(intermediates)/fileapi/JSBlobBuilder.h \
+    $(intermediates)/fileapi/JSDOMFileSystem.h \
+    $(intermediates)/fileapi/JSDOMFileSystemSync.h \
+    $(intermediates)/fileapi/JSDirectoryEntry.h \
+    $(intermediates)/fileapi/JSDirectoryEntrySync.h \
+    $(intermediates)/fileapi/JSDirectoryReader.h \
+    $(intermediates)/fileapi/JSDirectoryReaderSync.h \
+    $(intermediates)/fileapi/JSEntriesCallback.h \
+    $(intermediates)/fileapi/JSEntry.h \
+    $(intermediates)/fileapi/JSEntryArray.h \
+    $(intermediates)/fileapi/JSEntryArraySync.h \
+    $(intermediates)/fileapi/JSEntryCallback.h \
+    $(intermediates)/fileapi/JSEntrySync.h \
+    $(intermediates)/fileapi/JSErrorCallback.h \
+    $(intermediates)/fileapi/JSFile.h \
+    $(intermediates)/fileapi/JSFileCallback.h \
+    $(intermediates)/fileapi/JSFileEntry.h \
+    $(intermediates)/fileapi/JSFileEntrySync.h \
+    $(intermediates)/fileapi/JSFileError.h \
+    $(intermediates)/fileapi/JSFileException.h \
+    $(intermediates)/fileapi/JSFileList.h \
+    $(intermediates)/fileapi/JSFileReader.h \
+    $(intermediates)/fileapi/JSFileReaderSync.h \
+    $(intermediates)/fileapi/JSFileSystemCallback.h \
+    $(intermediates)/fileapi/JSFileWriter.h \
+    $(intermediates)/fileapi/JSFileWriterCallback.h \
+    $(intermediates)/fileapi/JSFlags.h \
+    $(intermediates)/fileapi/JSMetadata.h \
+    $(intermediates)/fileapi/JSMetadataCallback.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)
@@ -274,6 +299,7 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/html/%.cpp : $(intermediates)/htm
 # Canvas
 GEN := \
     $(intermediates)/html/canvas/JSArrayBuffer.h \
+    $(intermediates)/html/canvas/JSArrayBufferView.h \
     $(intermediates)/html/canvas/JSCanvasGradient.h \
     $(intermediates)/html/canvas/JSCanvasPattern.h \
     $(intermediates)/html/canvas/JSCanvasRenderingContext.h \
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index 8de2856..38d55fd 100644
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -146,10 +146,34 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
 GEN := \
     $(intermediates)/bindings/V8Blob.h \
     $(intermediates)/bindings/V8BlobBuilder.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/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 $@) $<
@@ -259,6 +283,7 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
 # Canvas
 GEN := \
     $(intermediates)/bindings/V8ArrayBuffer.h \
+    $(intermediates)/bindings/V8ArrayBufferView.h \
     $(intermediates)/bindings/V8CanvasGradient.h \
     $(intermediates)/bindings/V8CanvasPattern.h \
     $(intermediates)/bindings/V8CanvasPixelArray.h \
diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk
index 9e89e2c..fee0094 100644
--- a/WebCore/Android.jscbindings.mk
+++ b/WebCore/Android.jscbindings.mk
@@ -64,6 +64,8 @@ LOCAL_SRC_FILES += \
 	bindings/js/DOMWrapperWorld.cpp \
 	bindings/js/GCController.cpp \
 	bindings/js/IDBBindingUtilities.cpp \
+	bindings/js/JSArrayBufferCustom.cpp \
+	bindings/js/JSArrayBufferViewCustom.cpp \
 	bindings/js/JSAttrCustom.cpp \
 	bindings/js/JSAudioConstructor.cpp \
 	bindings/js/JSCDATASectionCustom.cpp \
@@ -100,8 +102,10 @@ LOCAL_SRC_FILES += \
 	bindings/js/JSDesktopNotificationsCustom.cpp \
 	bindings/js/JSDeviceMotionEventCustom.cpp \
 	bindings/js/JSDeviceOrientationEventCustom.cpp \
+	bindings/js/JSDirectoryEntrySyncCustom.cpp \
 	bindings/js/JSDocumentCustom.cpp \
 	bindings/js/JSElementCustom.cpp \
+	bindings/js/JSEntrySyncCustom.cpp \
 	bindings/js/JSEventCustom.cpp \
 	bindings/js/JSEventListener.cpp \
 	bindings/js/JSEventTarget.cpp \
@@ -128,6 +132,9 @@ LOCAL_SRC_FILES += \
 	bindings/js/JSIDBKeyCustom.cpp \
 	bindings/js/JSImageConstructor.cpp \
 	bindings/js/JSImageDataCustom.cpp \
+	bindings/js/JSInt16ArrayCustom.cpp \
+	bindings/js/JSInt32ArrayCustom.cpp \
+	bindings/js/JSInt8ArrayCustom.cpp \
 	bindings/js/JSLazyEventListener.cpp \
 	bindings/js/JSLocationCustom.cpp \
 	bindings/js/JSMainThreadExecState.cpp \
@@ -160,6 +167,9 @@ LOCAL_SRC_FILES += \
 	bindings/js/JSTouchCustom.cpp \
 	bindings/js/JSTouchListCustom.cpp \
 	bindings/js/JSTreeWalkerCustom.cpp \
+	bindings/js/JSUint16ArrayCustom.cpp \
+	bindings/js/JSUint32ArrayCustom.cpp \
+	bindings/js/JSUint8ArrayCustom.cpp \
 	bindings/js/JSWebKitCSSMatrixCustom.cpp \
 	bindings/js/JSWebKitPointCustom.cpp \
 	bindings/js/JSWorkerContextBase.cpp \
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index 0d78865..bbc8bdc 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -259,13 +259,20 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	fileapi/Blob.cpp \
 	fileapi/BlobBuilder.cpp \
 	fileapi/BlobURL.cpp \
+	fileapi/DOMFileSystemBase.cpp \
+	fileapi/DOMFileSystemSync.cpp \
+	fileapi/DirectoryEntrySync.cpp \
+	fileapi/DirectoryReaderSync.cpp \
+	fileapi/EntryArraySync.cpp \
+	fileapi/EntrySync.cpp \
 	fileapi/File.cpp \
+	fileapi/FileEntrySync.cpp \
 	fileapi/FileList.cpp \
 	fileapi/FileReader.cpp \
 	fileapi/FileStreamProxy.cpp \
 	fileapi/FileThread.cpp \
 	fileapi/ThreadableBlobRegistry.cpp \
-    \
+	\
 	history/BackForwardController.cpp \
 	history/BackForwardListImpl.cpp \
 	history/CachedFrame.cpp \
@@ -333,6 +340,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	html/ValidityState.cpp \
 	html/WeekInputType.cpp \
 	\
+	html/canvas/ArrayBuffer.cpp \
+	html/canvas/ArrayBufferView.cpp \
 	html/canvas/CanvasGradient.cpp \
 	html/canvas/WebGLObject.cpp \
 	html/canvas/CanvasPattern.cpp \
@@ -341,6 +350,12 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	html/canvas/CanvasRenderingContext2D.cpp \
 	html/canvas/CanvasStyle.cpp \
 	html/canvas/Float32Array.cpp \
+	html/canvas/Int16Array.cpp \
+	html/canvas/Int32Array.cpp \
+	html/canvas/Int8Array.cpp \
+	html/canvas/Uint16Array.cpp \
+	html/canvas/Uint32Array.cpp \
+	html/canvas/Uint8Array.cpp \
 	\
 	html/parser/HTMLConstructionSite.cpp \
 	html/parser/HTMLDocumentParser.cpp \
@@ -380,13 +395,13 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	loader/ImageLoader.cpp \
 	loader/MainResourceLoader.cpp \
 	loader/NavigationAction.cpp \
+	loader/NavigationScheduler.cpp \
 	loader/NetscapePlugInStreamLoader.cpp \
 	loader/PingLoader.cpp \
 	loader/PlaceholderDocument.cpp \
 	loader/PolicyCallback.cpp \
 	loader/PolicyChecker.cpp \
 	loader/ProgressTracker.cpp \
-	loader/NavigationScheduler.cpp \
 	loader/Request.cpp \
 	loader/ResourceLoadNotifier.cpp \
 	loader/ResourceLoader.cpp \
@@ -405,7 +420,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	loader/appcache/ManifestParser.cpp \
 	\
 	loader/icon/IconDatabase.cpp \
-	loader/icon/IconFetcher.cpp \
 	loader/icon/IconLoader.cpp \
 	loader/icon/IconRecord.cpp \
 	loader/icon/PageURLRecord.cpp \
@@ -479,6 +493,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	platform/KURL.cpp \
 	platform/KURLGoogle.cpp \
 	platform/KillRingNone.cpp \
+	platform/Language.cpp \
 	platform/Length.cpp \
 	platform/LinkHash.cpp \
 	platform/LocalizedStrings.cpp \
@@ -644,12 +659,14 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	platform/network/BlobResourceHandle.cpp \
 	platform/network/Credential.cpp \
 	platform/network/CredentialStorage.cpp \
+	platform/network/DataURL.cpp \
 	platform/network/FormData.cpp \
 	platform/network/FormDataBuilder.cpp \
 	platform/network/HTTPHeaderMap.cpp \
 	platform/network/HTTPParsers.cpp \
 	platform/network/NetworkStateNotifier.cpp \
 	platform/network/ProtectionSpace.cpp \
+	platform/network/ProxyServer.cpp \
 	platform/network/ResourceErrorBase.cpp \
 	platform/network/ResourceHandle.cpp \
 	platform/network/ResourceRequestBase.cpp \
@@ -657,6 +674,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	\
 	platform/network/android/CookieJarAndroid.cpp \
 	platform/network/android/NetworkStateNotifierAndroid.cpp \
+	platform/network/android/ProxyServerAndroid.cpp \
 	platform/network/android/ResourceHandleAndroid.cpp \
 	platform/network/android/ResourceRequestAndroid.cpp \
 	\
@@ -675,11 +693,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	platform/text/RegularExpression.cpp \
 	platform/text/SegmentedString.cpp \
 	platform/text/String.cpp \
-<<<<<<< HEAD
-	platform/text/StringBuilder.cpp \
 	platform/text/TextBoundaries.cpp \
-=======
->>>>>>> webkit.org at r70209
 	platform/text/TextBreakIteratorICU.cpp \
 	platform/text/TextCodec.cpp \
 	platform/text/TextCodecICU.cpp \
@@ -792,6 +806,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	rendering/RenderSVGShadowTreeRootContainer.cpp \
 	rendering/RenderSVGTransformableContainer.cpp \
 	rendering/RenderSVGViewportContainer.cpp \
+	\
 	rendering/svg/RenderSVGInline.cpp \
 	rendering/svg/RenderSVGInlineText.cpp \
 	rendering/svg/RenderSVGPath.cpp \
@@ -892,6 +907,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	storage/DatabaseThread.cpp \
 	storage/DatabaseTracker.cpp \
 	storage/IDBAny.cpp \
+	storage/IDBCompleteEvent.cpp \
 	storage/IDBCursor.cpp \
 	storage/IDBCursorBackendImpl.cpp \
 	storage/IDBDatabase.cpp \
@@ -909,6 +925,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	storage/IDBObjectStoreBackendImpl.cpp \
 	storage/IDBRequest.cpp \
 	storage/IDBSuccessEvent.cpp \
+	storage/IDBTimeoutEvent.cpp \
 	storage/IDBTransaction.cpp \
 	storage/LocalStorageTask.cpp \
 	storage/LocalStorageThread.cpp \
diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk
index e10adb7..dce9186 100644
--- a/WebCore/Android.v8bindings.mk
+++ b/WebCore/Android.v8bindings.mk
@@ -64,7 +64,6 @@ LOCAL_SRC_FILES += \
 	bindings/v8/ScriptObject.cpp \
 	bindings/v8/ScriptScope.cpp \
 	bindings/v8/ScriptState.cpp \
-	bindings/v8/ScriptStringImpl.cpp \
 	bindings/v8/ScriptValue.cpp \
 	bindings/v8/SerializedScriptValue.cpp \
 	bindings/v8/StaticDOMDataStore.cpp \
@@ -95,6 +94,8 @@ LOCAL_SRC_FILES += \
 	\
 	bindings/v8/npruntime.cpp \
 	\
+	bindings/v8/custom/V8ArrayBufferCustom.cpp \
+	bindings/v8/custom/V8ArrayBufferViewCustom.cpp \
 	bindings/v8/custom/V8CSSRuleCustom.cpp \
 	bindings/v8/custom/V8CSSStyleDeclarationCustom.cpp \
 	bindings/v8/custom/V8CSSStyleSheetCustom.cpp \
@@ -118,17 +119,15 @@ LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp \
 	bindings/v8/custom/V8DeviceMotionEventCustom.cpp \
 	bindings/v8/custom/V8DeviceOrientationEventCustom.cpp \
+	bindings/v8/custom/V8DirectoryEntrySyncCustom.cpp \
 	bindings/v8/custom/V8DocumentCustom.cpp \
 	bindings/v8/custom/V8DocumentLocationCustom.cpp \
 	bindings/v8/custom/V8ElementCustom.cpp \
+	bindings/v8/custom/V8EntrySyncCustom.cpp \
 	bindings/v8/custom/V8EventCustom.cpp \
 	bindings/v8/custom/V8EventSourceConstructor.cpp \
-<<<<<<< HEAD
+	bindings/v8/custom/V8FileReaderCustom.cpp \
 	bindings/v8/custom/V8Float32ArrayCustom.cpp \
-=======
-	bindings/v8/custom/V8FileListCustom.cpp \
-    bindings/v8/custom/V8FileReaderCustom.cpp \
->>>>>>> webkit.org at r70209
 	bindings/v8/custom/V8GeolocationCustom.cpp \
 	bindings/v8/custom/V8HistoryCustom.cpp \
 	bindings/v8/custom/V8HTMLAllCollectionCustom.cpp \
@@ -147,6 +146,9 @@ LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp \
 	bindings/v8/custom/V8HTMLPlugInElementCustom.cpp \
 	bindings/v8/custom/V8HTMLSelectElementCustom.cpp \
+	bindings/v8/custom/V8Int16ArrayCustom.cpp \
+	bindings/v8/custom/V8Int32ArrayCustom.cpp \
+	bindings/v8/custom/V8Int8ArrayCustom.cpp \
 	bindings/v8/custom/V8LocationCustom.cpp \
 	bindings/v8/custom/V8MessageChannelConstructor.cpp \
 	bindings/v8/custom/V8MessagePortCustom.cpp \
@@ -160,6 +162,9 @@ LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8SQLResultSetRowListCustom.cpp \
 	bindings/v8/custom/V8SQLTransactionCustom.cpp \
 	bindings/v8/custom/V8SQLTransactionSyncCustom.cpp \
+	bindings/v8/custom/V8Uint16ArrayCustom.cpp \
+	bindings/v8/custom/V8Uint32ArrayCustom.cpp \
+	bindings/v8/custom/V8Uint8ArrayCustom.cpp \
 	bindings/v8/custom/V8WebSocketCustom.cpp
 
 ifeq ($(ENABLE_SVG), true)