Merge WebKit at r74534: Fix Makefiles

Change-Id: Ife4c035f871dd827884645255ce788fbdb49f84e

9 files changed, 79 insertions, 7 deletions

diff --git a/Android.mk b/Android.mk
index 51640aa..bc68c00 100644
--- a/Android.mk
+++ b/Android.mk
@@ -142,6 +142,7 @@ LOCAL_C_INCLUDES := \
 	external/ \
 	external/icu4c/common \
 	external/icu4c/i18n \
+	external/jpeg \
 	external/libxml2/include \
 	external/libxslt \
 	external/hyphenation \
@@ -170,6 +171,7 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
 	$(LOCAL_PATH)/WebCore/html \
 	$(LOCAL_PATH)/WebCore/html/canvas \
 	$(LOCAL_PATH)/WebCore/html/parser \
+	$(LOCAL_PATH)/WebCore/html/shadow \
 	$(LOCAL_PATH)/WebCore/inspector \
 	$(LOCAL_PATH)/WebCore/loader \
 	$(LOCAL_PATH)/WebCore/loader/appcache \
@@ -492,4 +494,4 @@ include $(BASE_PATH)/WebKit/android/wds/client/Android.mk
 include $(BASE_PATH)/WebKit/android/benchmark/Android.mk
 
 # Build the webkit merge tool.
-include $(BASE_PATH)/WebKitTools/android/webkitmerge/Android.mk
+include $(BASE_PATH)/Tools/android/webkitmerge/Android.mk
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk
index f077738..d12bd8a 100644
--- a/JavaScriptCore/Android.mk
+++ b/JavaScriptCore/Android.mk
@@ -172,11 +172,12 @@ LOCAL_SRC_FILES := \
 	wtf/HashTable.cpp \
 	wtf/MD5.cpp \
 	wtf/MainThread.cpp \
+	wtf/OSAllocatorPosix.cpp \
 	wtf/PageAllocationAligned.cpp\
 	wtf/PageBlock.cpp\
 	wtf/RandomNumber.cpp \
 	wtf/RefCountedLeakCounter.cpp \
-    wtf/StackBounds.cpp \
+	wtf/StackBounds.cpp \
 	wtf/TCSystemAlloc.cpp \
 	wtf/ThreadIdentifierDataPthreads.cpp \
 	wtf/Threading.cpp \
diff --git a/JavaScriptCore/Android.v8.wtf.mk b/JavaScriptCore/Android.v8.wtf.mk
index d92dbb6..340ed90 100644
--- a/JavaScriptCore/Android.v8.wtf.mk
+++ b/JavaScriptCore/Android.v8.wtf.mk
@@ -41,9 +41,12 @@ LOCAL_SRC_FILES := \
 	wtf/HashTable.cpp \
 	wtf/MD5.cpp \
 	wtf/MainThread.cpp \
+	wtf/OSAllocatorPosix.cpp \
+	wtf/PageAllocationAligned.cpp \
+	wtf/PageBlock.cpp \
 	wtf/RandomNumber.cpp \
 	wtf/RefCountedLeakCounter.cpp \
-    wtf/StackBounds.cpp \
+	wtf/StackBounds.cpp \
 	wtf/TCSystemAlloc.cpp \
 	wtf/ThreadIdentifierDataPthreads.cpp \
 	wtf/Threading.cpp \
diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk
index 4ac6317..a5ccfba 100644
--- a/WebCore/Android.derived.jscbindings.mk
+++ b/WebCore/Android.derived.jscbindings.mk
@@ -229,6 +229,7 @@ GEN := \
     $(intermediates)/html/JSHTMLDataGridColElement.h \
     $(intermediates)/html/JSHTMLDataGridRowElement.h \
     $(intermediates)/html/JSHTMLDataListElement.h \
+    $(intermediates)/html/JSHTMLDetailsElement.h \
     $(intermediates)/html/JSHTMLDListElement.h \
     $(intermediates)/html/JSHTMLDirectoryElement.h \
     $(intermediates)/html/JSHTMLDivElement.h \
@@ -314,10 +315,19 @@ GEN := \
     $(intermediates)/html/canvas/JSInt8Array.h \
     $(intermediates)/html/canvas/JSInt16Array.h \
     $(intermediates)/html/canvas/JSInt32Array.h \
+    $(intermediates)/html/canvas/JSOESTextureFloat.h \
     $(intermediates)/html/canvas/JSUint8Array.h \
     $(intermediates)/html/canvas/JSUint16Array.h \
     $(intermediates)/html/canvas/JSUint32Array.h \
+    $(intermediates)/html/canvas/JSWebGLActiveInfo.h \
+    $(intermediates)/html/canvas/JSWebGLBuffer.h \
+    $(intermediates)/html/canvas/JSWebGLFramebuffer.h \
+    $(intermediates)/html/canvas/JSWebGLProgram.h \
+    $(intermediates)/html/canvas/JSWebGLRenderbuffer.h \
     $(intermediates)/html/canvas/JSWebGLRenderingContext.h \
+    $(intermediates)/html/canvas/JSWebGLShader.h \
+    $(intermediates)/html/canvas/JSWebGLTexture.h \
+    $(intermediates)/html/canvas/JSWebGLUniformLocation.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 $@) $<
@@ -669,6 +679,22 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
 # above rules.  Specifying this explicitly makes -j2 work.
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/inspector/%.cpp : $(intermediates)/inspector/%.h
 
+# WebAudio
+# These headers are required even when WebAudio is disabled
+GEN := \
+    $(intermediates)/webaudio/JSAudioContext.h \
+    $(intermediates)/webaudio/JSAudioPannerNode.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 $@) $<
+$(GEN): $(intermediates)/webaudio/JS%.h : $(LOCAL_PATH)/webaudio/%.idl $(js_binding_scripts)
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
+
+# We also need the .cpp files, which are generated as side effects of the
+# above rules.  Specifying this explicitly makes -j2 work.
+$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/webaudio/%.cpp : $(intermediates)/webaudio/%.h
+
 # HTML tag and attribute names
 
 GEN:= $(intermediates)/HTMLNames.cpp $(intermediates)/HTMLNames.h $(intermediates)/HTMLElementFactory.cpp $(intermediates)/HTMLElementFactory.h $(intermediates)/JSHTMLElementWrapperFactory.cpp $(intermediates)/JSHTMLElementWrapperFactory.h
diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk
index 7c26491..5d345b4 100644
--- a/WebCore/Android.derived.mk
+++ b/WebCore/Android.derived.mk
@@ -78,7 +78,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
 
 GEN := $(intermediates)/html/HTMLEntityTable.cpp
 $(GEN): SCRIPT := $(LOCAL_PATH)/../WebCore/html/parser/create-html-entity-table
-$(GEN): WEBKITPY_RESOURCES_DIRECTORY := $(LOCAL_PATH)/../WebKitTools/Scripts/webkitpy
+$(GEN): WEBKITPY_RESOURCES_DIRECTORY := $(LOCAL_PATH)/../Tools/Scripts/webkitpy
 $(GEN): PRIVATE_CUSTOM_TOOL = $(dir $@)$(notdir $(SCRIPT)) -o $@ $<
 $(GEN): $(LOCAL_PATH)/html/parser/HTMLEntityNames.in
 	@echo "Generating HTMLEntityTable.cpp"
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index baa75cc..32851f3 100644
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -213,6 +213,7 @@ GEN := \
     $(intermediates)/bindings/V8HTMLDataGridElement.h \
     $(intermediates)/bindings/V8HTMLDataGridRowElement.h \
     $(intermediates)/bindings/V8HTMLDataListElement.h \
+    $(intermediates)/bindings/V8HTMLDetailsElement.h \
     $(intermediates)/bindings/V8HTMLDListElement.h \
     $(intermediates)/bindings/V8HTMLDirectoryElement.h \
     $(intermediates)/bindings/V8HTMLDivElement.h \
@@ -299,6 +300,7 @@ GEN := \
     $(intermediates)/bindings/V8Int8Array.h \
     $(intermediates)/bindings/V8Int16Array.h \
     $(intermediates)/bindings/V8Int32Array.h \
+    $(intermediates)/bindings/V8OESTextureFloat.h \
     $(intermediates)/bindings/V8Uint8Array.h \
     $(intermediates)/bindings/V8Uint16Array.h \
     $(intermediates)/bindings/V8Uint32Array.h \
@@ -706,6 +708,22 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
 # above rules.  Specifying this explicitly makes -j2 work.
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)/bindings/%.h
 
+# Web Audio
+# These headers are required by the V8 bindings even when Web Audio is disabled
+GEN := \
+    $(intermediates)/bindings/V8AudioContext.h \
+    $(intermediates)/bindings/V8AudioPannerNode.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 webaudio --outputdir $(dir $@) $<
+$(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/webaudio/%.idl $(js_binding_scripts)
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
+
+# We also need the .cpp files, which are generated as side effects of the
+# above rules.  Specifying this explicitly makes -j2 work.
+$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)/bindings/%.h
+
 # HTML tag and attribute names
 GEN:= $(intermediates)/HTMLNames.cpp $(intermediates)/HTMLNames.h $(intermediates)/HTMLElementFactory.cpp $(intermediates)/HTMLElementFactory.h $(intermediates)/V8HTMLElementWrapperFactory.cpp $(intermediates)/V8HTMLElementWrapperFactory.h
 $(GEN): PRIVATE_PATH := $(LOCAL_PATH)
diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk
index 35de9c2..ff5fff1 100644
--- a/WebCore/Android.jscbindings.mk
+++ b/WebCore/Android.jscbindings.mk
@@ -56,6 +56,7 @@ BINDING_C_INCLUDES := \
 	$(base_intermediates)/WebCore/plugins \
 	$(base_intermediates)/WebCore/storage \
 	$(base_intermediates)/WebCore/svg \
+	$(base_intermediates)/WebCore/webaudio \
 	$(base_intermediates)/WebCore/workers \
 	$(base_intermediates)/WebCore/xml
 
@@ -66,6 +67,7 @@ LOCAL_SRC_FILES += \
 	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 \
@@ -82,6 +84,7 @@ LOCAL_SRC_FILES += \
 	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 \
@@ -144,6 +147,7 @@ LOCAL_SRC_FILES += \
 	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 \
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index b25525b..ed3abd6 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -246,6 +246,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	editing/ReplaceSelectionCommand.cpp \
 	editing/SelectionController.cpp \
 	editing/SetNodeAttributeCommand.cpp \
+	editing/SpellChecker.cpp \
 	editing/SplitElementCommand.cpp \
 	editing/SplitTextNodeCommand.cpp \
 	editing/SplitTextNodeContainingElementCommand.cpp \
@@ -314,6 +315,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	html/HTMLAllCollection.cpp \
 	html/HTMLCollection.cpp \
 	html/HTMLDataListElement.cpp \
+	html/HTMLDetailsElement.cpp \
 	html/HTMLDocument.cpp \
 	html/HTMLElementsAllInOne.cpp \
 	html/HTMLFormCollection.cpp \
@@ -367,9 +369,11 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	html/canvas/Int16Array.cpp \
 	html/canvas/Int32Array.cpp \
 	html/canvas/Int8Array.cpp \
+	html/canvas/OESTextureFloat.cpp \
 	html/canvas/Uint16Array.cpp \
 	html/canvas/Uint32Array.cpp \
 	html/canvas/Uint8Array.cpp \
+	html/canvas/WebGLExtension.cpp \
 	html/canvas/WebGLObject.cpp \
 	\
 	html/parser/HTMLConstructionSite.cpp \
@@ -391,17 +395,21 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	\
 	html/shadow/SliderThumbElement.cpp \
 	\
+	inspector/ScriptArguments.cpp \
+	inspector/ScriptCallStack.cpp \
+	inspector/ScriptCallFrame.cpp \
+	\
 	loader/cache/CachedCSSStyleSheet.cpp \
 	loader/cache/CachedFont.cpp \
 	loader/cache/CachedImage.cpp \
 	loader/cache/CachedResource.cpp \
 	loader/cache/CachedResourceClientWalker.cpp \
 	loader/cache/CachedResourceHandle.cpp \
+	loader/cache/CachedResourceLoader.cpp \
+	loader/cache/CachedResourceRequest.cpp \
 	loader/cache/CachedScript.cpp \
 	loader/CrossOriginAccessControl.cpp \
 	loader/CrossOriginPreflightResultCache.cpp \
-	loader/cache/CachedResourceLoader.cpp \
-	loader/cache/CachedResourceRequest.cpp \
 	loader/DocumentLoader.cpp \
 	loader/DocumentThreadableLoader.cpp \
 	loader/DocumentWriter.cpp \
@@ -420,7 +428,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	loader/PolicyCallback.cpp \
 	loader/PolicyChecker.cpp \
 	loader/ProgressTracker.cpp \
-	loader/NavigationScheduler.cpp \
 	loader/ResourceLoadNotifier.cpp \
 	loader/ResourceLoadScheduler.cpp \
 	loader/ResourceLoader.cpp \
@@ -500,6 +507,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	\
 	platform/Arena.cpp \
 	platform/ContentType.cpp \
+	platform/ContextMenuItem.cpp \
 	platform/CrossThreadCopier.cpp \
 	platform/Cursor.cpp \
 	platform/DeprecatedPtrListImpl.cpp \
@@ -560,6 +568,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	platform/animation/Animation.cpp \
 	platform/animation/AnimationList.cpp \
 	\
+	platform/audio/mkl/FFTFrameMKL.cpp \
+	\
 	platform/graphics/BitmapImage.cpp \
 	platform/graphics/Color.cpp \
 	platform/graphics/FloatPoint.cpp \
@@ -678,6 +688,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	platform/image-decoders/gif/GIFImageDecoder.cpp \
 	platform/image-decoders/gif/GIFImageReader.cpp \
 	\
+	platform/image-encoders/skia/JPEGImageEncoder.cpp \
+	\
 	platform/mock/DeviceOrientationClientMock.cpp \
 	platform/mock/GeolocationClientMock.cpp \
 	platform/mock/GeolocationServiceMock.cpp \
@@ -778,6 +790,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	rendering/RenderBoxModelObject.cpp \
 	rendering/RenderButton.cpp \
 	rendering/RenderCounter.cpp \
+	rendering/RenderDetails.cpp \
+	rendering/RenderDetailsMarker.cpp \
 	rendering/RenderEmbeddedObject.cpp \
 	rendering/RenderFieldset.cpp \
 	rendering/RenderFileUploadControl.cpp \
@@ -862,6 +876,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	rendering/RenderScrollbarPart.cpp \
 	rendering/RenderScrollbarTheme.cpp \
 	rendering/RenderSlider.cpp \
+	rendering/RenderSummary.cpp \
 	rendering/RenderTable.cpp \
 	rendering/RenderTableCell.cpp \
 	rendering/RenderTableCol.cpp \
@@ -1129,6 +1144,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 endif
 
 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
+	webaudio/AudioParam.cpp \
+	\
 	workers/AbstractWorker.cpp \
 	workers/DedicatedWorkerContext.cpp \
 	workers/DedicatedWorkerThread.cpp \
diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk
index f0f8f0e..0aecefb 100644
--- a/WebCore/Android.v8bindings.mk
+++ b/WebCore/Android.v8bindings.mk
@@ -147,6 +147,7 @@ LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8HTMLOutputElementCustom.cpp \
 	bindings/v8/custom/V8HTMLPlugInElementCustom.cpp \
 	bindings/v8/custom/V8HTMLSelectElementCustom.cpp \
+	bindings/v8/custom/V8ImageDataCustom.cpp \
 	bindings/v8/custom/V8Int16ArrayCustom.cpp \
 	bindings/v8/custom/V8Int32ArrayCustom.cpp \
 	bindings/v8/custom/V8Int8ArrayCustom.cpp \