Merge WebKit at r82507: Fix makefiles

Change-Id: Ia541ed77797442b5894b6fb88b3b829cc59c3535

6 files changed, 10 insertions, 29 deletions

diff --git a/Source/JavaScriptCore/Android.mk b/Source/JavaScriptCore/Android.mk
index c6b3737..bf60ab0 100644
--- a/Source/JavaScriptCore/Android.mk
+++ b/Source/JavaScriptCore/Android.mk
@@ -45,6 +45,7 @@ LOCAL_SRC_FILES := \
 	bytecompiler/NodesCodegen.cpp \
 	\
 	collector/handles/HandleHeap.cpp \
+	collector/handles/HandleStack.cpp \
 	\
 	debugger/Debugger.cpp \
 	debugger/DebuggerActivation.cpp \
diff --git a/Source/WebCore/Android.derived.jscbindings.mk b/Source/WebCore/Android.derived.jscbindings.mk
index eb070a4..8045dd6 100644
--- a/Source/WebCore/Android.derived.jscbindings.mk
+++ b/Source/WebCore/Android.derived.jscbindings.mk
@@ -110,6 +110,7 @@ GEN := \
     $(intermediates)/dom/JSDOMImplementation.h \
     $(intermediates)/dom/JSDOMStringList.h \
     $(intermediates)/dom/JSDOMStringMap.h \
+    $(intermediates)/dom/JSDataTransferItems.h \
     $(intermediates)/dom/JSDeviceMotionEvent.h \
     $(intermediates)/dom/JSDeviceOrientationEvent.h \
     $(intermediates)/dom/JSDocument.h \
@@ -375,12 +376,9 @@ GEN := \
     $(intermediates)/page/JSNavigator.h \
     $(intermediates)/page/JSPositionError.h \
     $(intermediates)/page/JSScreen.h \
-<<<<<<< HEAD
     $(intermediates)/page/JSSpeechInputEvent.h \
-=======
     $(intermediates)/page/JSWebKitAnimation.h \
     $(intermediates)/page/JSWebKitAnimationList.h \
->>>>>>> webkit.org at r82507
     $(intermediates)/page/JSWebKitPoint.h \
     $(intermediates)/page/JSWorkerNavigator.h
 
diff --git a/Source/WebCore/Android.derived.v8bindings.mk b/Source/WebCore/Android.derived.v8bindings.mk
index 0bee200..12aca59 100644
--- a/Source/WebCore/Android.derived.v8bindings.mk
+++ b/Source/WebCore/Android.derived.v8bindings.mk
@@ -93,6 +93,7 @@ GEN := \
     $(intermediates)/bindings/V8DOMImplementation.h \
     $(intermediates)/bindings/V8DOMStringList.h \
     $(intermediates)/bindings/V8DOMStringMap.h \
+    $(intermediates)/bindings/V8DataTransferItems.h \
     $(intermediates)/bindings/V8DeviceMotionEvent.h \
     $(intermediates)/bindings/V8DeviceOrientationEvent.h \
     $(intermediates)/bindings/V8Document.h \
@@ -361,12 +362,9 @@ GEN := \
     $(intermediates)/bindings/V8Navigator.h \
     $(intermediates)/bindings/V8PositionError.h \
     $(intermediates)/bindings/V8Screen.h \
-<<<<<<< HEAD
     $(intermediates)/bindings/V8SpeechInputEvent.h \
-=======
     $(intermediates)/bindings/V8WebKitAnimation.h \
     $(intermediates)/bindings/V8WebKitAnimationList.h \
->>>>>>> webkit.org at r82507
     $(intermediates)/bindings/V8WebKitPoint.h \
     $(intermediates)/bindings/V8WorkerNavigator.h
 $(GEN): PRIVATE_PATH := $(LOCAL_PATH)
diff --git a/Source/WebCore/Android.jscbindings.mk b/Source/WebCore/Android.jscbindings.mk
index 44738a9..d4affb7 100644
--- a/Source/WebCore/Android.jscbindings.mk
+++ b/Source/WebCore/Android.jscbindings.mk
@@ -183,6 +183,8 @@ LOCAL_SRC_FILES += \
 	bindings/js/JSUint16ArrayCustom.cpp \
 	bindings/js/JSUint32ArrayCustom.cpp \
 	bindings/js/JSUint8ArrayCustom.cpp \
+	bindings/js/JSWebKitAnimationCustom.cpp \
+	bindings/js/JSWebKitAnimationListCustom.cpp \
 	bindings/js/JSWebKitCSSKeyframeRuleCustom.cpp \
 	bindings/js/JSWebKitCSSKeyframesRuleCustom.cpp \
 	bindings/js/JSWebKitCSSMatrixCustom.cpp \
diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk
index f7ecf6d..83c2182 100644
--- a/Source/WebCore/Android.mk
+++ b/Source/WebCore/Android.mk
@@ -45,6 +45,7 @@ LOCAL_SRC_FILES := \
 	css/CSSImportRule.cpp \
 	css/CSSInheritedValue.cpp \
 	css/CSSInitialValue.cpp \
+	css/CSSLineBoxContainValue.cpp \
 	css/CSSMediaRule.cpp \
 	css/CSSMutableStyleDeclaration.cpp \
 	css/CSSOMUtils.cpp \
@@ -62,6 +63,7 @@ LOCAL_SRC_FILES := \
 	css/CSSSegmentedFontFace.cpp \
 	css/CSSSelector.cpp \
 	css/CSSSelectorList.cpp \
+	css/CSSStyleApplyProperty.cpp \
 	css/CSSStyleDeclaration.cpp \
 	css/CSSStyleRule.cpp \
 	css/CSSStyleSelector.cpp \
@@ -121,12 +123,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	dom/CustomEvent.cpp \
 	dom/DOMImplementation.cpp \
 	dom/DOMStringList.cpp \
-<<<<<<< HEAD
 	dom/DOMStringMap.cpp \
 	dom/DatasetDOMStringMap.cpp \
-=======
-	dom/DataTransferItem.cpp \
->>>>>>> webkit.org at r82507
 	dom/DecodedDataDocumentParser.cpp \
 	dom/DeviceMotionController.cpp \
 	dom/DeviceMotionData.cpp \
@@ -466,11 +464,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	loader/cache/MemoryCache.cpp \
 	\
 	loader/icon/IconDatabase.cpp \
-<<<<<<< HEAD
-=======
 	loader/icon/IconDatabaseBase.cpp \
-	loader/icon/IconFetcher.cpp \
->>>>>>> webkit.org at r82507
 	loader/icon/IconLoader.cpp \
 	loader/icon/IconRecord.cpp \
 	loader/icon/PageURLRecord.cpp \
@@ -536,11 +530,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	platform/ContentType.cpp \
 	platform/ContextMenuItem.cpp \
 	platform/CrossThreadCopier.cpp \
-<<<<<<< HEAD
 	platform/Cursor.cpp \
-=======
-	platform/DefaultLocalizationStrategy.cpp \
->>>>>>> webkit.org at r82507
 	platform/DragData.cpp \
 	platform/DragImage.cpp \
 	platform/FileChooser.cpp \
@@ -987,7 +977,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	storage/DatabaseThread.cpp \
 	storage/DatabaseTracker.cpp \
 	storage/IDBAny.cpp \
-	storage/IDBBackingStore.cpp \
 	storage/IDBCursor.cpp \
 	storage/IDBCursorBackendImpl.cpp \
 	storage/IDBCursorWithValue.cpp \
@@ -1027,7 +1016,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	storage/StorageMap.cpp \
 	storage/StorageNamespace.cpp \
 	storage/StorageNamespaceImpl.cpp \
-	storage/StorageSyncManager.cpp
+	storage/StorageSyncManager.cpp \
+	storage/StorageTracker.cpp
 
 ifeq ($(ENABLE_SVG), true)
 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
diff --git a/Source/WebCore/Android.v8bindings.mk b/Source/WebCore/Android.v8bindings.mk
index 8d858d9..99e56f1 100644
--- a/Source/WebCore/Android.v8bindings.mk
+++ b/Source/WebCore/Android.v8bindings.mk
@@ -52,11 +52,7 @@ LOCAL_SRC_FILES += \
 	bindings/v8/IsolatedWorld.cpp \
 	bindings/v8/MainThreadDOMData.cpp \
 	bindings/v8/NPV8Object.cpp \
-<<<<<<< HEAD
-=======
 	bindings/v8/RetainedDOMInfo.cpp \
-	bindings/v8/RuntimeEnabledFeatures.cpp \
->>>>>>> webkit.org at r82507
 	bindings/v8/ScheduledAction.cpp \
 	bindings/v8/ScopedDOMDataStore.cpp \
 	bindings/v8/ScriptCachedFrameData.cpp \
@@ -172,6 +168,7 @@ LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8Uint16ArrayCustom.cpp \
 	bindings/v8/custom/V8Uint32ArrayCustom.cpp \
 	bindings/v8/custom/V8Uint8ArrayCustom.cpp \
+	bindings/v8/custom/V8WebKitAnimationCustom.cpp \
 	bindings/v8/custom/V8WebSocketCustom.cpp
 
 ifeq ($(ENABLE_SVG), true)
@@ -187,11 +184,6 @@ LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8StorageCustom.cpp \
 	bindings/v8/custom/V8StyleSheetCustom.cpp \
 	bindings/v8/custom/V8StyleSheetListCustom.cpp \
-<<<<<<< HEAD
-=======
-	bindings/v8/custom/V8TreeWalkerCustom.cpp \
-	bindings/v8/custom/V8WebKitAnimationCustom.cpp \
->>>>>>> webkit.org at r82507
 	bindings/v8/custom/V8WebKitCSSMatrixConstructor.cpp \
 	bindings/v8/custom/V8WebKitPointConstructor.cpp \
 	bindings/v8/custom/V8WorkerContextCustom.cpp \