Merge WebKit at r80534: Fix makefiles.

Add new and remove deleted files to fix makefiles.

See http://trac.webkit.org/changeset/79861 for new
XSLTreeViewer generation.

Also remove a stub from TemporaryLInkStubs that we now get
by compiling the correct files in JSC (see
http://trac.webkit.org/changeset/78634).

Change-Id: I550b035b7c9c915b42738366da7817dca020c9a8

diff --git a/Android.mk b/Android.mk
index acc102c..f79cb95 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -238,6 +238,7 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
 
 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
        $(JAVASCRIPTCORE_PATH) \
+       $(JAVASCRIPTCORE_PATH)/collector/handles \
        $(JAVASCRIPTCORE_PATH)/wtf \
        $(JAVASCRIPTCORE_PATH)/wtf/unicode \
        $(JAVASCRIPTCORE_PATH)/wtf/unicode/icu
@@ -246,7 +247,8 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
        $(WEBCORE_INTERMEDIATES_PATH) \
        $(WEBCORE_INTERMEDIATES_PATH)/css \
        $(WEBCORE_INTERMEDIATES_PATH)/html \
-       $(WEBCORE_INTERMEDIATES_PATH)/platform
+       $(WEBCORE_INTERMEDIATES_PATH)/platform \
+       $(WEBCORE_INTERMEDIATES_PATH)/xml
 
 # The following includes are needed by the AutoFill feature, or the chrome http
 # stack

diff --git a/Source/JavaScriptCore/Android.mk b/Source/JavaScriptCore/Android.mk
index e789a1a..c6b3737 100644 (file)
--- a/Source/JavaScriptCore/Android.mk
+++ b/Source/JavaScriptCore/Android.mk
@@ -25,7 +25,12 @@
 
 LOCAL_SRC_FILES := \
        API/JSValueRef.cpp \
+       API/JSCallbackConstructor.cpp \
+       API/JSCallbackFunction.cpp \
        API/JSCallbackObject.cpp \
+       API/JSClassRef.cpp \
+       API/JSObjectRef.cpp \
+       API/JSStringRef.cpp \
        API/OpaqueJSString.cpp \
        \
        assembler/ARMv7Assembler.cpp \
@@ -39,6 +44,8 @@ LOCAL_SRC_FILES := \
        bytecompiler/BytecodeGenerator.cpp \
        bytecompiler/NodesCodegen.cpp \
        \
+       collector/handles/HandleHeap.cpp \
+       \
        debugger/Debugger.cpp \
        debugger/DebuggerActivation.cpp \
        debugger/DebuggerCallFrame.cpp \
@@ -98,7 +105,6 @@ LOCAL_SRC_FILES := \
        runtime/FunctionConstructor.cpp \
        runtime/FunctionPrototype.cpp \
        runtime/GCActivityCallback.cpp \
-       runtime/GCHandle.cpp \
        runtime/GetterSetter.cpp \
        runtime/Identifier.cpp \
        runtime/InitializeThreading.cpp \
@@ -108,6 +114,7 @@ LOCAL_SRC_FILES := \
        runtime/JSArray.cpp \
        runtime/JSByteArray.cpp \
        runtime/JSCell.cpp \
+       runtime/JSChunk.cpp \
        runtime/JSFunction.cpp \
        runtime/JSGlobalData.cpp \
        runtime/JSGlobalObject.cpp \
@@ -177,6 +184,7 @@ LOCAL_SRC_FILES := \
        wtf/PageBlock.cpp\
        wtf/RandomNumber.cpp \
        wtf/RefCountedLeakCounter.cpp \
+       wtf/SHA1.cpp \
        wtf/StackBounds.cpp \
        wtf/TCSystemAlloc.cpp \
        wtf/ThreadIdentifierDataPthreads.cpp \

diff --git a/Source/JavaScriptCore/Android.v8.wtf.mk b/Source/JavaScriptCore/Android.v8.wtf.mk
index 603c454..140186f 100644 (file)
--- a/Source/JavaScriptCore/Android.v8.wtf.mk
+++ b/Source/JavaScriptCore/Android.v8.wtf.mk
@@ -42,6 +42,7 @@ LOCAL_SRC_FILES := \
        wtf/PageBlock.cpp \
        wtf/RandomNumber.cpp \
        wtf/RefCountedLeakCounter.cpp \
+       wtf/SHA1.cpp \
        wtf/StackBounds.cpp \
        wtf/TCSystemAlloc.cpp \
        wtf/ThreadIdentifierDataPthreads.cpp \

diff --git a/Source/WebCore/Android.derived.jscbindings.mk b/Source/WebCore/Android.derived.jscbindings.mk
index dccbf05..831f2f5 100644 (file)
--- a/Source/WebCore/Android.derived.jscbindings.mk
+++ b/Source/WebCore/Android.derived.jscbindings.mk
@@ -318,6 +318,7 @@ GEN := \
     $(intermediates)/html/canvas/JSInt16Array.h \
     $(intermediates)/html/canvas/JSInt32Array.h \
     $(intermediates)/html/canvas/JSOESTextureFloat.h \
+    $(intermediates)/html/canvas/JSOESVertexArrayObject.h \
     $(intermediates)/html/canvas/JSUint8Array.h \
     $(intermediates)/html/canvas/JSUint16Array.h \
     $(intermediates)/html/canvas/JSUint32Array.h \
@@ -330,6 +331,7 @@ GEN := \
     $(intermediates)/html/canvas/JSWebGLShader.h \
     $(intermediates)/html/canvas/JSWebGLTexture.h \
     $(intermediates)/html/canvas/JSWebGLUniformLocation.h \
+    $(intermediates)/html/canvas/JSWebGLVertexArrayObjectOES.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 --outputdir $(dir $@) $<
@@ -449,19 +451,19 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/storage/%.cpp : $(intermediates)/
 GEN := \
     $(intermediates)/storage/JSIDBAny.h \
     $(intermediates)/storage/JSIDBCursor.h \
+    $(intermediates)/storage/JSIDBCursorWithValue.h \
     $(intermediates)/storage/JSIDBDatabaseError.h \
     $(intermediates)/storage/JSIDBDatabaseException.h \
     $(intermediates)/storage/JSIDBDatabase.h \
-    $(intermediates)/storage/JSIDBErrorEvent.h \
-    $(intermediates)/storage/JSIDBEvent.h \
     $(intermediates)/storage/JSIDBFactory.h \
     $(intermediates)/storage/JSIDBIndex.h \
     $(intermediates)/storage/JSIDBKey.h \
     $(intermediates)/storage/JSIDBKeyRange.h \
     $(intermediates)/storage/JSIDBObjectStore.h \
     $(intermediates)/storage/JSIDBRequest.h \
-    $(intermediates)/storage/JSIDBSuccessEvent.h \
-    $(intermediates)/storage/JSIDBTransaction.h
+    $(intermediates)/storage/JSIDBTransaction.h \
+    $(intermediates)/storage/JSIDBVersionChangeEvent.h \
+    $(intermediates)/storage/JSIDBVersionChangeRequest.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 storage --outputdir $(dir $@) $<

diff --git a/Source/WebCore/Android.derived.mk b/Source/WebCore/Android.derived.mk
index f6967ef..56076b3 100644 (file)
--- a/Source/WebCore/Android.derived.mk
+++ b/Source/WebCore/Android.derived.mk
@@ -73,6 +73,14 @@ $(GEN): $(LOCAL_PATH)/html/DocTypeStrings.gperf
        $(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)
 
+# XMLViewer XSLT
+
+GEN := $(intermediates)/xml/XMLViewerXSL.h
+$(GEN): SCRIPT := $(LOCAL_PATH)/inspector/xxd.pl
+$(GEN): PRIVATE_CUSTOM_TOOL = perl $(SCRIPT) XMLViewer_xsl $< $@
+$(GEN): $(LOCAL_PATH)/xml/XMLViewer.xsl
+       $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
 
 # HTML entity table
 

diff --git a/Source/WebCore/Android.derived.v8bindings.mk b/Source/WebCore/Android.derived.v8bindings.mk
index 93f8548..1612df9 100644 (file)
--- a/Source/WebCore/Android.derived.v8bindings.mk
+++ b/Source/WebCore/Android.derived.v8bindings.mk
@@ -303,6 +303,7 @@ GEN := \
     $(intermediates)/bindings/V8Int16Array.h \
     $(intermediates)/bindings/V8Int32Array.h \
     $(intermediates)/bindings/V8OESTextureFloat.h \
+    $(intermediates)/bindings/V8OESVertexArrayObject.h \
     $(intermediates)/bindings/V8Uint8Array.h \
     $(intermediates)/bindings/V8Uint16Array.h \
     $(intermediates)/bindings/V8Uint32Array.h \
@@ -316,6 +317,7 @@ GEN := \
     $(intermediates)/bindings/V8WebGLShader.h \
     $(intermediates)/bindings/V8WebGLTexture.h \
     $(intermediates)/bindings/V8WebGLUniformLocation.h \
+    $(intermediates)/bindings/V8WebGLVertexArrayObjectOES.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 html/canvas --outputdir $(dir $@) $<
@@ -434,19 +436,19 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
 GEN := \
     $(intermediates)/bindings/V8IDBAny.h \
     $(intermediates)/bindings/V8IDBCursor.h \
+    $(intermediates)/bindings/V8IDBCursorWithValue.h \
     $(intermediates)/bindings/V8IDBDatabaseError.h \
     $(intermediates)/bindings/V8IDBDatabaseException.h \
     $(intermediates)/bindings/V8IDBDatabase.h \
-    $(intermediates)/bindings/V8IDBErrorEvent.h \
-    $(intermediates)/bindings/V8IDBEvent.h \
     $(intermediates)/bindings/V8IDBFactory.h \
     $(intermediates)/bindings/V8IDBIndex.h \
     $(intermediates)/bindings/V8IDBKey.h \
     $(intermediates)/bindings/V8IDBKeyRange.h \
     $(intermediates)/bindings/V8IDBObjectStore.h \
     $(intermediates)/bindings/V8IDBRequest.h \
-    $(intermediates)/bindings/V8IDBSuccessEvent.h \
-    $(intermediates)/bindings/V8IDBTransaction.h
+    $(intermediates)/bindings/V8IDBTransaction.h \
+    $(intermediates)/bindings/V8IDBVersionChangeEvent.h \
+    $(intermediates)/bindings/V8IDBVersionChangeRequest.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 storage --outputdir $(dir $@) $<

diff --git a/Source/WebCore/Android.jscbindings.mk b/Source/WebCore/Android.jscbindings.mk
index d491cd2..f3b12be 100644 (file)
--- a/Source/WebCore/Android.jscbindings.mk
+++ b/Source/WebCore/Android.jscbindings.mk
@@ -98,9 +98,7 @@ LOCAL_SRC_FILES += \
        bindings/js/JSDOMMimeTypeArrayCustom.cpp \
        bindings/js/JSDOMPluginArrayCustom.cpp \
        bindings/js/JSDOMPluginCustom.cpp \
-       bindings/js/JSDOMSettableTokenList.cpp \
        bindings/js/JSDOMStringMapCustom.cpp \
-       bindings/js/JSDOMTokenList.cpp \
        bindings/js/JSDOMWindowBase.cpp \
        bindings/js/JSDOMWindowCustom.cpp \
        bindings/js/JSDOMWindowShell.cpp \

diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk
index 31b066a..b2ad8f4 100644 (file)
--- a/Source/WebCore/Android.mk
+++ b/Source/WebCore/Android.mk
@@ -179,6 +179,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        dom/Range.cpp \
        dom/RegisteredEventListener.cpp \
        dom/ScopedEventQueue.cpp \
+       dom/ScriptedAnimationController.cpp \
        dom/ScriptableDocumentParser.cpp \
        dom/ScriptElement.cpp \
        dom/ScriptExecutionContext.cpp \
@@ -247,7 +248,9 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        editing/ReplaceSelectionCommand.cpp \
        editing/SelectionController.cpp \
        editing/SetNodeAttributeCommand.cpp \
+       editing/SetSelectionCommand.cpp \
        editing/SpellChecker.cpp \
+       editing/SpellingCorrectionCommand.cpp \
        editing/SplitElementCommand.cpp \
        editing/SplitTextNodeCommand.cpp \
        editing/SplitTextNodeContainingElementCommand.cpp \
@@ -272,6 +275,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        fileapi/DirectoryEntrySync.cpp \
        fileapi/DirectoryReaderSync.cpp \
        fileapi/EntryArraySync.cpp \
+       fileapi/EntryBase.cpp \
        fileapi/EntrySync.cpp \
        fileapi/File.cpp \
        fileapi/FileEntrySync.cpp \
@@ -372,11 +376,13 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        html/canvas/Int32Array.cpp \
        html/canvas/Int8Array.cpp \
        html/canvas/OESTextureFloat.cpp \
+       html/canvas/OESVertexArrayObject.cpp \
        html/canvas/Uint16Array.cpp \
        html/canvas/Uint32Array.cpp \
        html/canvas/Uint8Array.cpp \
        html/canvas/WebGLExtension.cpp \
        html/canvas/WebGLObject.cpp \
+       html/canvas/WebGLVertexArrayObjectOES.cpp \
        \
        html/parser/HTMLConstructionSite.cpp \
        html/parser/HTMLDocumentParser.cpp \
@@ -727,7 +733,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        platform/network/ResourceResponseBase.cpp \
        \
        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 \
@@ -965,13 +970,13 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        storage/DatabaseThread.cpp \
        storage/DatabaseTracker.cpp \
        storage/IDBAny.cpp \
-       storage/IDBCompleteEvent.cpp \
+       storage/IDBBackingStore.cpp \
        storage/IDBCursor.cpp \
        storage/IDBCursorBackendImpl.cpp \
+       storage/IDBCursorWithValue.cpp \
        storage/IDBDatabase.cpp \
        storage/IDBDatabaseBackendImpl.cpp \
-       storage/IDBErrorEvent.cpp \
-       storage/IDBEvent.cpp \
+       storage/IDBEventDispatcher.cpp \
        storage/IDBFactory.cpp \
        storage/IDBFactoryBackendInterface.cpp \
        storage/IDBFactoryBackendImpl.cpp \
@@ -982,9 +987,9 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        storage/IDBObjectStore.cpp \
        storage/IDBObjectStoreBackendImpl.cpp \
        storage/IDBRequest.cpp \
-       storage/IDBSQLiteDatabase.cpp \
-       storage/IDBSuccessEvent.cpp \
        storage/IDBTransaction.cpp \
+       storage/IDBVersionChangeEvent.cpp \
+       storage/IDBVersionChangeRequest.cpp \
        storage/LocalStorageTask.cpp \
        storage/LocalStorageThread.cpp \
        storage/OriginQuotaManager.cpp \
@@ -1177,7 +1182,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        xml/XMLHttpRequest.cpp \
        xml/XMLHttpRequestProgressEventThrottle.cpp \
        xml/XMLHttpRequestUpload.cpp \
-       xml/XMLSerializer.cpp
+       xml/XMLSerializer.cpp \
+       xml/XMLTreeViewer.cpp
 
 # For XPath
 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \

diff --git a/Source/WebCore/platform/android/TemporaryLinkStubs.cpp b/Source/WebCore/platform/android/TemporaryLinkStubs.cpp
index 126400a..ede06dc 100644 (file)
--- a/Source/WebCore/platform/android/TemporaryLinkStubs.cpp
+++ b/Source/WebCore/platform/android/TemporaryLinkStubs.cpp
@@ -465,22 +465,6 @@ void AXObjectCache::remove(Widget*)
     notImplemented();
 }
 
-#if USE(JSC)
-using namespace JSC;
-
-
-OpaqueJSClass::~OpaqueJSClass()
-{
-    notImplemented();
-}
-
-OpaqueJSClassContextData::~OpaqueJSClassContextData()
-{
-    notImplemented();
-}
-
-#endif
-
 namespace WebCore {
 
 void setCookieStoragePrivateBrowsingEnabled(bool)