Merge Webkit at r70949: Fix Makefiles.

Change-Id: I53862fae2dd81232760db726c7783437af5f58f4

diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk
index 6699ad8..dfc7b9f 100644 (file)
--- a/WebCore/Android.jscbindings.mk
+++ b/WebCore/Android.jscbindings.mk
@@ -92,8 +92,6 @@ LOCAL_SRC_FILES += \
        bindings/js/JSDOMPluginArrayCustom.cpp \
        bindings/js/JSDOMPluginCustom.cpp \
        bindings/js/JSDOMStringMapCustom.cpp \
-       bindings/js/JSDOMSettableTokenList.cpp \
-       bindings/js/JSDOMTokenList.cpp \
        bindings/js/JSDOMWindowBase.cpp \
        bindings/js/JSDOMWindowCustom.cpp \
        bindings/js/JSDOMWindowShell.cpp \

diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index acb6285..84cbf7a 100644 (file)
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -244,6 +244,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        editing/SplitElementCommand.cpp \
        editing/SplitTextNodeCommand.cpp \
        editing/SplitTextNodeContainingElementCommand.cpp \
+       editing/TextCheckingHelper.cpp \
        editing/TextIterator.cpp \
        editing/TypingCommand.cpp \
        editing/UnlinkCommand.cpp \
@@ -269,6 +270,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        fileapi/FileEntrySync.cpp \
        fileapi/FileList.cpp \
        fileapi/FileReader.cpp \
+       fileapi/FileReaderLoader.cpp \
        fileapi/FileStreamProxy.cpp \
        fileapi/FileThread.cpp \
        fileapi/ThreadableBlobRegistry.cpp \
@@ -283,6 +285,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        history/android/HistoryItemAndroid.cpp \
        \
        html/AsyncImageResizer.cpp \
+       html/BaseButtonInputType.cpp \
+       html/BaseCheckableInputType.cpp \
        html/BaseDateAndTimeInputType.cpp \
        html/BaseTextInputType.cpp \
        html/ButtonInputType.cpp \
@@ -630,6 +634,7 @@ endif
 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        platform/graphics/skia/FloatPointSkia.cpp \
        platform/graphics/skia/FloatRectSkia.cpp \
+       platform/graphics/skia/GlyphPageTreeNodeSkia.cpp \
        platform/graphics/skia/IntPointSkia.cpp \
        platform/graphics/skia/IntRectSkia.cpp \
        platform/graphics/skia/NativeImageSkia.cpp \
@@ -927,6 +932,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        storage/IDBObjectStore.cpp \
        storage/IDBObjectStoreBackendImpl.cpp \
        storage/IDBRequest.cpp \
+       storage/IDBSQLiteDatabase.cpp \
        storage/IDBSuccessEvent.cpp \
        storage/IDBTimeoutEvent.cpp \
        storage/IDBTransaction.cpp \

diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk
index dce9186..fc74a30 100644 (file)
--- a/WebCore/Android.v8bindings.mk
+++ b/WebCore/Android.v8bindings.mk
@@ -112,6 +112,7 @@ LOCAL_SRC_FILES += \
        bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp \
        bindings/v8/custom/V8CustomVoidCallback.cpp \
        bindings/v8/custom/V8DOMFormDataCustom.cpp \
+       bindings/v8/custom/V8DOMSettableTokenListCustom.cpp \
        bindings/v8/custom/V8DOMStringMapCustom.cpp \
        bindings/v8/custom/V8DOMTokenListCustom.cpp \
        bindings/v8/custom/V8DOMWindowCustom.cpp \