Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 250 insertions, 0 deletions

diff --git a/Source/WebCore/Android.jscbindings.mk b/Source/WebCore/Android.jscbindings.mk
new file mode 100644
index 0000000..b14769a
--- /dev/null
+++ b/Source/WebCore/Android.jscbindings.mk
@@ -0,0 +1,250 @@
+##
+## Copyright 2009, The Android Open Source Project
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions
+## are met:
+##  * Redistributions of source code must retain the above copyright
+##    notice, this list of conditions and the following disclaimer.
+##  * Redistributions in binary form must reproduce the above copyright
+##    notice, this list of conditions and the following disclaimer in the
+##    documentation and/or other materials provided with the distribution.
+##
+## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+## EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+## PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+## EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+## PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+## OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+##
+
+BINDING_C_INCLUDES := \
+	$(LOCAL_PATH)/bindings/js \
+	$(LOCAL_PATH)/bindings/js/specialization \
+	$(LOCAL_PATH)/bridge \
+	$(LOCAL_PATH)/bridge/c \
+	$(LOCAL_PATH)/bridge/jni \
+	$(LOCAL_PATH)/bridge/jni/jsc \
+	$(LOCAL_PATH)/bridge/jsc \
+	\
+	$(JAVASCRIPTCORE_PATH)/API \
+	$(JAVASCRIPTCORE_PATH)/assembler \
+	$(JAVASCRIPTCORE_PATH)/bytecode \
+	$(JAVASCRIPTCORE_PATH)/bytecompiler \
+	$(JAVASCRIPTCORE_PATH)/debugger \
+	$(JAVASCRIPTCORE_PATH)/parser \
+	$(JAVASCRIPTCORE_PATH)/jit \
+	$(JAVASCRIPTCORE_PATH)/interpreter \
+	$(JAVASCRIPTCORE_PATH)/pcre \
+	$(JAVASCRIPTCORE_PATH)/profiler \
+	$(JAVASCRIPTCORE_PATH)/runtime \
+	$(JAVASCRIPTCORE_PATH)/wrec \
+	$(JAVASCRIPTCORE_PATH)/ForwardingHeaders \
+	\
+<<<<<<< HEAD:WebCore/Android.jscbindings.mk
+	$(WEBCORE_INTERMEDIATES_PATH)/bindings/js \
+	$(WEBCORE_INTERMEDIATES_PATH)/dom \
+	$(WEBCORE_INTERMEDIATES_PATH)/fileapi \
+	$(WEBCORE_INTERMEDIATES_PATH)/html/canvas \
+	$(WEBCORE_INTERMEDIATES_PATH)/inspector \
+	$(WEBCORE_INTERMEDIATES_PATH)/loader/appcache \
+	$(WEBCORE_INTERMEDIATES_PATH)/page \
+	$(WEBCORE_INTERMEDIATES_PATH)/plugins \
+	$(WEBCORE_INTERMEDIATES_PATH)/storage \
+	$(WEBCORE_INTERMEDIATES_PATH)/svg \
+	$(WEBCORE_INTERMEDIATES_PATH)/webaudio \
+	$(WEBCORE_INTERMEDIATES_PATH)/workers \
+	$(WEBCORE_INTERMEDIATES_PATH)/xml
+=======
+	$(base_intermediates)/Source/WebCore/bindings/js \
+	$(base_intermediates)/Source/WebCore/dom \
+	$(base_intermediates)/Source/WebCore/html/canvas \
+	$(base_intermediates)/Source/WebCore/inspector \
+	$(base_intermediates)/Source/WebCore/loader/appcache \
+	$(base_intermediates)/Source/WebCore/page \
+	$(base_intermediates)/Source/WebCore/plugins \
+	$(base_intermediates)/Source/WebCore/storage \
+	$(base_intermediates)/Source/WebCore/workers \
+	$(base_intermediates)/Source/WebCore/xml
+>>>>>>> webkit.org at r75315:Source/WebCore/Android.jscbindings.mk
+
+LOCAL_SRC_FILES += \
+	bindings/js/DOMObjectHashTableMap.cpp \
+	bindings/js/DOMWrapperWorld.cpp \
+	bindings/js/GCController.cpp \
+	bindings/js/IDBBindingUtilities.cpp \
+	bindings/js/JSArrayBufferCustom.cpp \
+	bindings/js/JSAttrCustom.cpp \
+	bindings/js/JSAudioBufferSourceNodeCustom.cpp \
+	bindings/js/JSAudioConstructor.cpp \
+	bindings/js/JSCDATASectionCustom.cpp \
+	bindings/js/JSCSSFontFaceRuleCustom.cpp \
+	bindings/js/JSCSSImportRuleCustom.cpp \
+	bindings/js/JSCSSMediaRuleCustom.cpp \
+	bindings/js/JSCSSPageRuleCustom.cpp \
+	bindings/js/JSCSSRuleCustom.cpp \
+	bindings/js/JSCSSRuleListCustom.cpp \
+	bindings/js/JSCSSStyleDeclarationCustom.cpp \
+	bindings/js/JSCSSStyleRuleCustom.cpp \
+	bindings/js/JSCSSValueCustom.cpp \
+	bindings/js/JSCallbackData.cpp \
+	bindings/js/JSCanvasRenderingContext2DCustom.cpp \
+	bindings/js/JSCanvasRenderingContextCustom.cpp \
+	bindings/js/JSClipboardCustom.cpp \
+	bindings/js/JSConsoleCustom.cpp \
+	bindings/js/JSConvolverNodeCustom.cpp \
+	bindings/js/JSCoordinatesCustom.cpp \
+	bindings/js/JSCustomApplicationInstalledCallback.cpp \
+	bindings/js/JSCustomPositionCallback.cpp \
+	bindings/js/JSCustomPositionErrorCallback.cpp \
+	bindings/js/JSCustomSQLStatementErrorCallback.cpp \
+	bindings/js/JSCustomVoidCallback.cpp \
+	bindings/js/JSDOMApplicationCacheCustom.cpp \
+	bindings/js/JSDOMBinding.cpp \
+	bindings/js/JSDOMFormDataCustom.cpp \
+	bindings/js/JSDOMGlobalObject.cpp \
+	bindings/js/JSDOMMimeTypeArrayCustom.cpp \
+	bindings/js/JSDOMPluginArrayCustom.cpp \
+	bindings/js/JSDOMPluginCustom.cpp \
+	bindings/js/JSDOMStringMapCustom.cpp \
+	bindings/js/JSDOMWindowBase.cpp \
+	bindings/js/JSDOMWindowCustom.cpp \
+	bindings/js/JSDOMWindowShell.cpp \
+	bindings/js/JSDOMWrapper.cpp \
+	bindings/js/JSDataGridColumnListCustom.cpp \
+	bindings/js/JSDataGridDataSource.cpp \
+	bindings/js/JSDataViewCustom.cpp \
+	bindings/js/JSDedicatedWorkerContextCustom.cpp \
+	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 \
+	bindings/js/JSExceptionBase.cpp \
+	bindings/js/JSFloat32ArrayCustom.cpp \
+	bindings/js/JSFileReaderCustom.cpp \
+	bindings/js/JSGeolocationCustom.cpp \
+	bindings/js/JSHTMLAllCollectionCustom.cpp \
+	bindings/js/JSHTMLAppletElementCustom.cpp \
+	bindings/js/JSHTMLCanvasElementCustom.cpp \
+	bindings/js/JSHTMLCollectionCustom.cpp \
+	bindings/js/JSHTMLDataGridElementCustom.cpp \
+	bindings/js/JSHTMLDocumentCustom.cpp \
+	bindings/js/JSHTMLElementCustom.cpp \
+	bindings/js/JSHTMLEmbedElementCustom.cpp \
+	bindings/js/JSHTMLFormElementCustom.cpp \
+	bindings/js/JSHTMLFrameElementCustom.cpp \
+	bindings/js/JSHTMLFrameSetElementCustom.cpp \
+	bindings/js/JSHTMLInputElementCustom.cpp \
+	bindings/js/JSHTMLLinkElementCustom.cpp \
+	bindings/js/JSHTMLObjectElementCustom.cpp \
+	bindings/js/JSHTMLOptionsCollectionCustom.cpp \
+	bindings/js/JSHTMLOutputElementCustom.cpp \
+	bindings/js/JSHTMLSelectElementCustom.cpp \
+	bindings/js/JSHTMLStyleElementCustom.cpp \
+	bindings/js/JSHistoryCustom.cpp \
+	bindings/js/JSIDBAnyCustom.cpp \
+	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/JSJavaScriptAudioNodeCustom.cpp \
+	bindings/js/JSLazyEventListener.cpp \
+	bindings/js/JSLocationCustom.cpp \
+	bindings/js/JSMainThreadExecState.cpp \
+	bindings/js/JSMessageChannelCustom.cpp \
+	bindings/js/JSMessageEventCustom.cpp \
+	bindings/js/JSMessagePortCustom.cpp \
+	bindings/js/JSNamedNodeMapCustom.cpp \
+	bindings/js/JSNavigatorCustom.cpp \
+	bindings/js/JSNodeCustom.cpp \
+	bindings/js/JSNodeFilterCondition.cpp \
+	bindings/js/JSNodeFilterCustom.cpp \
+	bindings/js/JSNodeIteratorCustom.cpp \
+	bindings/js/JSNodeListCustom.cpp \
+	bindings/js/JSOptionConstructor.cpp \
+	bindings/js/JSPluginElementFunctions.cpp \
+	bindings/js/JSPopStateEventCustom.cpp \
+	bindings/js/JSProcessingInstructionCustom.cpp \
+	bindings/js/JSSQLResultSetRowListCustom.cpp \
+	bindings/js/JSSQLTransactionCustom.cpp \
+	bindings/js/JSSQLTransactionSyncCustom.cpp \
+	bindings/js/JSSVGElementInstanceCustom.cpp \
+	bindings/js/JSSVGLengthCustom.cpp \
+	bindings/js/JSSVGPathSegCustom.cpp \
+	bindings/js/JSSharedWorkerCustom.cpp \
+	bindings/js/JSStorageCustom.cpp \
+	bindings/js/JSStyleSheetCustom.cpp \
+	bindings/js/JSStyleSheetListCustom.cpp \
+	bindings/js/JSTextCustom.cpp \
+	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/JSWebKitCSSKeyframeRuleCustom.cpp \
+	bindings/js/JSWebKitCSSKeyframesRuleCustom.cpp \
+	bindings/js/JSWebKitCSSMatrixCustom.cpp \
+	bindings/js/JSWebKitPointCustom.cpp \
+	bindings/js/JSWorkerContextBase.cpp \
+	bindings/js/JSWorkerContextCustom.cpp \
+	bindings/js/JSWorkerContextErrorHandler.cpp \
+	bindings/js/JSWorkerCustom.cpp \
+	bindings/js/JSXMLHttpRequestCustom.cpp \
+	bindings/js/JSXMLHttpRequestUploadCustom.cpp \
+	bindings/js/JSXSLTProcessorCustom.cpp \
+	bindings/js/ScheduledAction.cpp \
+	bindings/js/ScriptCachedFrameData.cpp \
+	bindings/js/ScriptCallStackFactory.cpp \
+	bindings/js/ScriptController.cpp \
+	bindings/js/ScriptControllerAndroid.cpp \
+	bindings/js/ScriptEventListener.cpp \
+	bindings/js/ScriptFunctionCall.cpp \
+	bindings/js/ScriptObject.cpp \
+	bindings/js/ScriptProfile.cpp \
+	bindings/js/ScriptState.cpp \
+	bindings/js/ScriptValue.cpp \
+	bindings/js/SerializedScriptValue.cpp \
+	bindings/js/WorkerScriptController.cpp \
+	\
+	bindings/js/specialization/JSBindingState.cpp \
+	\
+	bindings/ScriptControllerBase.cpp \
+	\
+	bridge/IdentifierRep.cpp \
+	bridge/NP_jsobject.cpp \
+	bridge/c/CRuntimeObject.cpp \
+	bridge/c/c_class.cpp \
+	bridge/c/c_instance.cpp \
+	bridge/c/c_runtime.cpp \
+	bridge/c/c_utility.cpp \
+	bridge/jni/JNIBridge.cpp \
+	bridge/jni/JNIUtility.cpp \
+	bridge/jni/jsc/JNIBridgeJSC.cpp \
+	bridge/jni/jsc/JNIUtilityPrivate.cpp \
+	bridge/jni/jsc/JavaClassJSC.cpp \
+	bridge/jni/jsc/JavaInstanceJSC.cpp \
+	bridge/jni/jsc/JavaRuntimeObject.cpp \
+	bridge/jsc/BridgeJSC.cpp \
+	bridge/npruntime.cpp \
+	bridge/runtime_array.cpp \
+	bridge/runtime_method.cpp \
+	bridge/runtime_object.cpp \
+	bridge/runtime_root.cpp
+
+# For XPath.
+LOCAL_SRC_FILES += \
+	bindings/js/JSCustomXPathNSResolver.cpp