Merge Webkit at r73109: Fix Makefiles.

Change-Id: If8cc4cfc06399c67b08cf5157852de90876c3d55

6 files changed, 24 insertions, 7 deletions

diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk
index 6ae8c84..b4fe1f6 100644
--- a/JavaScriptCore/Android.mk
+++ b/JavaScriptCore/Android.mk
@@ -172,6 +172,7 @@ LOCAL_SRC_FILES := \
 	wtf/HashTable.cpp \
 	wtf/MD5.cpp \
 	wtf/MainThread.cpp \
+	wtf/OSAllocatorPosix.cpp \
 	wtf/PageAllocation.cpp \
 	wtf/RandomNumber.cpp \
 	wtf/RefCountedLeakCounter.cpp \
@@ -237,4 +238,10 @@ $(CHARTABLES): $(LOCAL_PATH)/pcre/dftables
 $(CHARTABLES): $(LOCAL_PATH)/pcre/pcre_internal.h
 	$(transform-generated-source)
 
-LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER) $(CHARTABLES)
+REGEXP_JIT_TABLES := $(intermediates)/RegExpJitTables.h
+$(REGEXP_JIT_TABLES): PRIVATE_PATH := $(LOCAL_PATH)
+$(REGEXP_JIT_TABLES): PRIVATE_CUSTOM_TOOL = python $(PRIVATE_PATH)/create_regex_tables > $@
+$(REGEXP_JIT_TABLES): $(LOCAL_PATH)/create_regex_tables
+	$(transform-generated-source)
+
+LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER) $(CHARTABLES) $(REGEXP_JIT_TABLES)
diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk
index f4415ae..4ac6317 100644
--- a/WebCore/Android.derived.jscbindings.mk
+++ b/WebCore/Android.derived.jscbindings.mk
@@ -73,6 +73,7 @@ GEN := \
     $(intermediates)/css/JSCSSValueList.h \
     $(intermediates)/css/JSCounter.h \
     $(intermediates)/css/JSMediaList.h \
+    $(intermediates)/css/JSMediaQueryList.h \
     $(intermediates)/css/JSRGBColor.h \
     $(intermediates)/css/JSRect.h \
     $(intermediates)/css/JSStyleMedia.h \
@@ -308,6 +309,7 @@ GEN := \
     $(intermediates)/html/canvas/JSCanvasPattern.h \
     $(intermediates)/html/canvas/JSCanvasRenderingContext.h \
     $(intermediates)/html/canvas/JSCanvasRenderingContext2D.h \
+    $(intermediates)/html/canvas/JSDataView.h \
     $(intermediates)/html/canvas/JSFloat32Array.h \
     $(intermediates)/html/canvas/JSInt8Array.h \
     $(intermediates)/html/canvas/JSInt16Array.h \
@@ -358,6 +360,7 @@ GEN := \
     $(intermediates)/page/JSNavigator.h \
     $(intermediates)/page/JSPositionError.h \
     $(intermediates)/page/JSScreen.h \
+    $(intermediates)/page/JSSpeechInputEvent.h \
     $(intermediates)/page/JSWebKitPoint.h \
     $(intermediates)/page/JSWorkerNavigator.h
 
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index 3cab051..baa75cc 100644
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -56,6 +56,7 @@ GEN := \
     $(intermediates)/bindings/V8CSSValueList.h \
     $(intermediates)/bindings/V8Counter.h \
     $(intermediates)/bindings/V8MediaList.h \
+    $(intermediates)/bindings/V8MediaQueryList.h \
     $(intermediates)/bindings/V8Rect.h \
     $(intermediates)/bindings/V8RGBColor.h \
     $(intermediates)/bindings/V8StyleMedia.h \
@@ -293,6 +294,7 @@ GEN := \
     $(intermediates)/bindings/V8CanvasPixelArray.h \
     $(intermediates)/bindings/V8CanvasRenderingContext.h \
     $(intermediates)/bindings/V8CanvasRenderingContext2D.h \
+    $(intermediates)/bindings/V8DataView.h \
     $(intermediates)/bindings/V8Float32Array.h \
     $(intermediates)/bindings/V8Int8Array.h \
     $(intermediates)/bindings/V8Int16Array.h \
@@ -352,6 +354,7 @@ GEN := \
     $(intermediates)/bindings/V8Navigator.h \
     $(intermediates)/bindings/V8PositionError.h \
     $(intermediates)/bindings/V8Screen.h \
+    $(intermediates)/bindings/V8SpeechInputEvent.h \
     $(intermediates)/bindings/V8WebKitPoint.h \
     $(intermediates)/bindings/V8WorkerNavigator.h
 $(GEN): PRIVATE_PATH := $(LOCAL_PATH)
diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk
index 35f9950..35de9c2 100644
--- a/WebCore/Android.jscbindings.mk
+++ b/WebCore/Android.jscbindings.mk
@@ -65,7 +65,6 @@ LOCAL_SRC_FILES += \
 	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 \
@@ -103,7 +102,7 @@ LOCAL_SRC_FILES += \
 	bindings/js/JSDOMWrapper.cpp \
 	bindings/js/JSDataGridColumnListCustom.cpp \
 	bindings/js/JSDataGridDataSource.cpp \
-	bindings/js/JSDatabaseCallback.cpp \
+	bindings/js/JSDataViewCustom.cpp \
 	bindings/js/JSDedicatedWorkerContextCustom.cpp \
 	bindings/js/JSDesktopNotificationsCustom.cpp \
 	bindings/js/JSDeviceMotionEventCustom.cpp \
@@ -168,7 +167,6 @@ LOCAL_SRC_FILES += \
 	bindings/js/JSSVGElementInstanceCustom.cpp \
 	bindings/js/JSSVGLengthCustom.cpp \
 	bindings/js/JSSVGPathSegCustom.cpp \
-	bindings/js/JSSVGPathSegListCustom.cpp \
 	bindings/js/JSSharedWorkerCustom.cpp \
 	bindings/js/JSStorageCustom.cpp \
 	bindings/js/JSStyleSheetCustom.cpp \
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index bcb5efe..5b15b01 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -75,6 +75,9 @@ LOCAL_SRC_FILES := \
 	css/MediaQuery.cpp \
 	css/MediaQueryEvaluator.cpp \
 	css/MediaQueryExp.cpp \
+	css/MediaQueryList.cpp \
+	css/MediaQueryListListener.cpp \
+	css/MediaQueryMatcher.cpp \
 	css/RGBColor.cpp \
 
 ifeq ($(ENABLE_SVG), true)
@@ -351,7 +354,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	html/canvas/ArrayBuffer.cpp \
 	html/canvas/ArrayBufferView.cpp \
 	html/canvas/CanvasGradient.cpp \
-	html/canvas/WebGLObject.cpp \
+	html/canvas/DataView.cpp \
 	html/canvas/CanvasPattern.cpp \
 	html/canvas/CanvasPixelArray.cpp \
 	html/canvas/CanvasRenderingContext.cpp \
@@ -364,6 +367,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	html/canvas/Uint16Array.cpp \
 	html/canvas/Uint32Array.cpp \
 	html/canvas/Uint8Array.cpp \
+	html/canvas/WebGLObject.cpp \
 	\
 	html/parser/HTMLConstructionSite.cpp \
 	html/parser/HTMLDocumentParser.cpp \
@@ -1117,7 +1121,9 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	\
 	svg/graphics/filters/SVGFEImage.cpp \
 	svg/graphics/filters/SVGFilter.cpp \
-	svg/graphics/filters/SVGFilterBuilder.cpp
+	svg/graphics/filters/SVGFilterBuilder.cpp \
+	\
+	svg/properties/SVGPathSegListPropertyTearOff.cpp
 endif
 
 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk
index d91b601..f0f8f0e 100644
--- a/WebCore/Android.v8bindings.mk
+++ b/WebCore/Android.v8bindings.mk
@@ -94,7 +94,6 @@ 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 \
@@ -116,6 +115,7 @@ LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8DOMTokenListCustom.cpp \
 	bindings/v8/custom/V8DOMWindowCustom.cpp \
 	bindings/v8/custom/V8DataGridColumnListCustom.cpp \
+	bindings/v8/custom/V8DataViewCustom.cpp \
 	bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp \
 	bindings/v8/custom/V8DeviceMotionEventCustom.cpp \
 	bindings/v8/custom/V8DeviceOrientationEventCustom.cpp \