Merge WebKit at r84325: Fix makefiles.

See http://trac.webkit.org/changeset/82562 for
new XMLTreeViewer generation.

Change-Id: I52c8d510602e7e77ea6a134510f8e5bb6b0c4d9a

8 files changed, 32 insertions, 50 deletions

diff --git a/Android.mk b/Android.mk
index fb3a06d..a1527f7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -239,6 +239,7 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
 	$(JAVASCRIPTCORE_PATH) \
 	$(JAVASCRIPTCORE_PATH)/collector/handles \
+	$(JAVASCRIPTCORE_PATH)/heap \
 	$(JAVASCRIPTCORE_PATH)/wtf \
 	$(JAVASCRIPTCORE_PATH)/wtf/unicode \
 	$(JAVASCRIPTCORE_PATH)/wtf/unicode/icu
diff --git a/Source/JavaScriptCore/Android.mk b/Source/JavaScriptCore/Android.mk
index 4cb76ad..48f326a 100644
--- a/Source/JavaScriptCore/Android.mk
+++ b/Source/JavaScriptCore/Android.mk
@@ -44,14 +44,13 @@ LOCAL_SRC_FILES := \
 	bytecompiler/BytecodeGenerator.cpp \
 	bytecompiler/NodesCodegen.cpp \
 	\
-	collector/handles/HandleHeap.cpp \
-	collector/handles/HandleStack.cpp \
-	\
 	debugger/Debugger.cpp \
 	debugger/DebuggerActivation.cpp \
 	debugger/DebuggerCallFrame.cpp \
 	\
 	heap/ConservativeRoots.cpp \
+	heap/HandleHeap.cpp \
+	heap/HandleStack.cpp \
 	heap/Heap.cpp \
 	heap/MachineStackMarker.cpp \
 	heap/MarkStack.cpp \
diff --git a/Source/WebCore/Android.derived.jscbindings.mk b/Source/WebCore/Android.derived.jscbindings.mk
index 0aef3f6..f8b704e 100644
--- a/Source/WebCore/Android.derived.jscbindings.mk
+++ b/Source/WebCore/Android.derived.jscbindings.mk
@@ -165,7 +165,6 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/dom/%.cpp : $(intermediates)/dom/
 # Fileapi
 GEN := \
     $(intermediates)/fileapi/JSBlob.h \
-    $(intermediates)/fileapi/JSBlobBuilder.h \
     $(intermediates)/fileapi/JSDOMFileSystem.h \
     $(intermediates)/fileapi/JSDOMFileSystemSync.h \
     $(intermediates)/fileapi/JSDirectoryEntry.h \
@@ -191,9 +190,10 @@ GEN := \
     $(intermediates)/fileapi/JSFileSystemCallback.h \
     $(intermediates)/fileapi/JSFileWriter.h \
     $(intermediates)/fileapi/JSFileWriterCallback.h \
-    $(intermediates)/fileapi/JSFlags.h \
     $(intermediates)/fileapi/JSMetadata.h \
-    $(intermediates)/fileapi/JSMetadataCallback.h
+    $(intermediates)/fileapi/JSMetadataCallback.h \
+    $(intermediates)/fileapi/JSWebKitBlobBuilder.h \
+    $(intermediates)/fileapi/JSWebKitFlags.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 $@) $<
@@ -207,10 +207,6 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/fileapi/%.cpp : $(intermediates)/
 
 # HTML
 GEN := \
-<<<<<<< HEAD
-=======
-    $(intermediates)/html/JSBlob.h \
->>>>>>> WebKit.org at r84325
     $(intermediates)/html/JSDOMFormData.h \
     $(intermediates)/html/JSDOMSettableTokenList.h \
     $(intermediates)/html/JSDOMTokenList.h \
@@ -297,8 +293,8 @@ GEN := \
     $(intermediates)/html/JSTextMetrics.h \
     $(intermediates)/html/JSTimeRanges.h \
     $(intermediates)/html/JSValidityState.h \
-    $(intermediates)/html/JSVoidCallback.h \
-    $(intermediates)/html/JSWebKitBlobBuilder.h
+    $(intermediates)/html/JSVoidCallback.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 $@) $<
diff --git a/Source/WebCore/Android.derived.mk b/Source/WebCore/Android.derived.mk
index 56076b3..4c0a7ca 100644
--- a/Source/WebCore/Android.derived.mk
+++ b/Source/WebCore/Android.derived.mk
@@ -73,12 +73,19 @@ $(GEN): $(LOCAL_PATH)/html/DocTypeStrings.gperf
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)
 
-# XMLViewer XSLT
+# XMLViewer CSS
+GEN := $(intermediates)/xml/XMLViewerCSS.h
+$(GEN): SCRIPT := $(LOCAL_PATH)/inspector/xxd.pl
+$(GEN): PRIVATE_CUSTOM_TOOL = perl $(SCRIPT) XMLViewer_css $< $@
+$(GEN): $(LOCAL_PATH)/xml/XMLViewer.css
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
 
-GEN := $(intermediates)/xml/XMLViewerXSL.h
+# XMLViewer JS
+GEN := $(intermediates)/xml/XMLViewerJS.h
 $(GEN): SCRIPT := $(LOCAL_PATH)/inspector/xxd.pl
-$(GEN): PRIVATE_CUSTOM_TOOL = perl $(SCRIPT) XMLViewer_xsl $< $@
-$(GEN): $(LOCAL_PATH)/xml/XMLViewer.xsl
+$(GEN): PRIVATE_CUSTOM_TOOL = perl $(SCRIPT) XMLViewer_js $< $@
+$(GEN): $(LOCAL_PATH)/xml/XMLViewer.js
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)
 
diff --git a/Source/WebCore/Android.derived.v8bindings.mk b/Source/WebCore/Android.derived.v8bindings.mk
index 6d08c1a..4a81f24 100644
--- a/Source/WebCore/Android.derived.v8bindings.mk
+++ b/Source/WebCore/Android.derived.v8bindings.mk
@@ -149,8 +149,6 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
 # Fileapi
 GEN := \
     $(intermediates)/bindings/V8Blob.h \
-<<<<<<< HEAD
-    $(intermediates)/bindings/V8BlobBuilder.h \
     $(intermediates)/bindings/V8DOMFileSystem.h \
     $(intermediates)/bindings/V8DOMFileSystemSync.h \
     $(intermediates)/bindings/V8DirectoryEntry.h \
@@ -176,9 +174,10 @@ GEN := \
     $(intermediates)/bindings/V8FileSystemCallback.h \
     $(intermediates)/bindings/V8FileWriter.h \
     $(intermediates)/bindings/V8FileWriterCallback.h \
-    $(intermediates)/bindings/V8Flags.h \
     $(intermediates)/bindings/V8Metadata.h \
-    $(intermediates)/bindings/V8MetadataCallback.h
+    $(intermediates)/bindings/V8MetadataCallback.h \
+    $(intermediates)/bindings/V8WebKitBlobBuilder.h \
+    $(intermediates)/bindings/V8WebKitFlags.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 $@) $<
@@ -193,9 +192,6 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
 # HTML
 GEN := \
     $(intermediates)/bindings/V8DOMFormData.h \
-=======
-    $(intermediates)/bindings/V8DOMTokenList.h \
->>>>>>> WebKit.org at r84325
     $(intermediates)/bindings/V8DOMSettableTokenList.h \
     $(intermediates)/bindings/V8DOMTokenList.h \
     $(intermediates)/bindings/V8DOMURL.h \
@@ -281,8 +277,8 @@ GEN := \
     $(intermediates)/bindings/V8TextMetrics.h \
     $(intermediates)/bindings/V8TimeRanges.h \
     $(intermediates)/bindings/V8ValidityState.h \
-    $(intermediates)/bindings/V8VoidCallback.h \
-    $(intermediates)/bindings/V8WebKitBlobBuilder.h
+    $(intermediates)/bindings/V8VoidCallback.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 --outputdir $(dir $@) $<
diff --git a/Source/WebCore/Android.jscbindings.mk b/Source/WebCore/Android.jscbindings.mk
index d21e7cf..bdd6d92 100644
--- a/Source/WebCore/Android.jscbindings.mk
+++ b/Source/WebCore/Android.jscbindings.mk
@@ -60,12 +60,9 @@ BINDING_C_INCLUDES := \
 	$(WEBCORE_INTERMEDIATES_PATH)/xml
 
 LOCAL_SRC_FILES += \
-<<<<<<< HEAD
+	bindings/js/CallbackFunction.cpp \
 	bindings/js/DOMObjectHashTableMap.cpp \
 	bindings/js/DOMWrapperWorld.cpp \
-=======
-	bindings/js/CallbackFunction.cpp \
->>>>>>> WebKit.org at r84325
 	bindings/js/GCController.cpp \
 	bindings/js/IDBBindingUtilities.cpp \
 	bindings/js/JSArrayBufferCustom.cpp \
diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk
index 33c134e..638bcb9 100644
--- a/Source/WebCore/Android.mk
+++ b/Source/WebCore/Android.mk
@@ -274,7 +274,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	editing/visible_units.cpp \
 	\
 	fileapi/Blob.cpp \
-	fileapi/BlobBuilder.cpp \
 	fileapi/BlobURL.cpp \
 	fileapi/DOMFileSystemBase.cpp \
 	fileapi/DOMFileSystemSync.cpp \
@@ -291,6 +290,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	fileapi/FileStreamProxy.cpp \
 	fileapi/FileThread.cpp \
 	fileapi/ThreadableBlobRegistry.cpp \
+	fileapi/WebKitBlobBuilder.cpp \
 	\
 	history/BackForwardController.cpp \
 	history/BackForwardListImpl.cpp \
@@ -409,11 +409,11 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	html/parser/TextViewSourceParser.cpp \
 	html/parser/XSSFilter.cpp \
 	\
+	html/shadow/DetailsMarkerControl.cpp \
 	html/shadow/MediaControls.cpp \
 	html/shadow/MediaControlElements.cpp \
 	html/shadow/MediaControlRootElement.cpp \
 	html/shadow/MeterShadowElement.cpp \
-	html/shadow/DetailControlElement.cpp \
 	html/shadow/ProgressShadowElement.cpp \
 	html/shadow/SliderThumbElement.cpp \
 	html/shadow/TextControlInnerElements.cpp \
@@ -553,12 +553,9 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	platform/LocalizedStrings.cpp \
 	platform/Logging.cpp \
 	platform/MIMETypeRegistry.cpp \
-<<<<<<< HEAD
+	platform/RuntimeApplicationChecks.cpp \
 	platform/SchemeRegistry.cpp \
 	platform/ScrollAnimator.cpp \
-=======
-	platform/RuntimeApplicationChecks.cpp \
->>>>>>> WebKit.org at r84325
 	platform/ScrollView.cpp \
 	platform/Scrollbar.cpp \
 	platform/ScrollableArea.cpp \
@@ -725,12 +722,10 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	platform/image-decoders/gif/GIFImageDecoder.cpp \
 	platform/image-decoders/gif/GIFImageReader.cpp \
 	\
-<<<<<<< HEAD
 	platform/image-encoders/skia/JPEGImageEncoder.cpp \
-=======
+	\
 	platform/leveldb/LevelDBDatabase.cpp \
 	platform/leveldb/LevelDBIterator.cpp \
->>>>>>> WebKit.org at r84325
 	\
 	platform/mock/DeviceOrientationClientMock.cpp \
 	platform/mock/GeolocationClientMock.cpp \
diff --git a/Source/WebCore/Android.v8bindings.mk b/Source/WebCore/Android.v8bindings.mk
index 791d8d4..e196bdd 100644
--- a/Source/WebCore/Android.v8bindings.mk
+++ b/Source/WebCore/Android.v8bindings.mk
@@ -157,7 +157,6 @@ LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8MessageChannelConstructor.cpp \
 	bindings/v8/custom/V8MessagePortCustom.cpp \
 	bindings/v8/custom/V8MessageEventCustom.cpp \
-	bindings/v8/custom/V8NavigatorCustom.cpp \
 	bindings/v8/custom/V8NamedNodeMapCustom.cpp \
 	bindings/v8/custom/V8NamedNodesCollection.cpp \
 	bindings/v8/custom/V8NavigatorCustom.cpp \
@@ -200,10 +199,9 @@ LOCAL_SRC_FILES += \
 	bridge/jni/JavaMethodJobject.cpp \
 	bridge/jni/JobjectWrapper.cpp \
 	bridge/jni/v8/JNIUtilityPrivate.cpp \
-<<<<<<< HEAD
-	bridge/jni/v8/JavaClassV8.cpp \
-	bridge/jni/v8/JavaFieldV8.cpp \
-	bridge/jni/v8/JavaInstanceV8.cpp \
+	bridge/jni/v8/JavaClassJobjectV8.cpp \
+	bridge/jni/v8/JavaFieldJobjectV8.cpp \
+	bridge/jni/v8/JavaInstanceJobjectV8.cpp \
 	bridge/jni/v8/JavaNPObjectV8.cpp
 
 # For XPath.
@@ -213,10 +211,3 @@ LOCAL_SRC_FILES += \
 # For XSLT.
 LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8XSLTProcessorCustom.cpp
-=======
-	bridge/jni/v8/JavaClassJobjectV8.cpp \
-	bridge/jni/v8/JavaFieldJobjectV8.cpp \
-	bridge/jni/v8/JavaInstanceJobjectV8.cpp \
-	bridge/jni/v8/JavaNPObject.cpp \
-	bridge/jni/v8/JobjectWrapper.cpp
->>>>>>> WebKit.org at r84325