summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/Android.mk
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-05-24 14:09:24 +0100
committerBen Murdoch <benm@google.com>2011-06-02 09:53:33 +0100
commit3b523b87218c05c8dd49c191e3d5a7a114907e82 (patch)
tree9cac2418495c9b21220887e2b785d5eb9bae11b3 /Source/WebCore/Android.mk
parent9921f05212aa840e1ce32e9f04fa60ca4b3bcbb7 (diff)
downloadexternal_webkit-3b523b87218c05c8dd49c191e3d5a7a114907e82.zip
external_webkit-3b523b87218c05c8dd49c191e3d5a7a114907e82.tar.gz
external_webkit-3b523b87218c05c8dd49c191e3d5a7a114907e82.tar.bz2
Merge WebKit at r80534: Fix makefiles.
Add new and remove deleted files to fix makefiles. See http://trac.webkit.org/changeset/79861 for new XSLTreeViewer generation. Also remove a stub from TemporaryLInkStubs that we now get by compiling the correct files in JSC (see http://trac.webkit.org/changeset/78634). Change-Id: I550b035b7c9c915b42738366da7817dca020c9a8
Diffstat (limited to 'Source/WebCore/Android.mk')
-rw-r--r--Source/WebCore/Android.mk20
1 files changed, 13 insertions, 7 deletions
diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk
index 31b066a..b2ad8f4 100644
--- a/Source/WebCore/Android.mk
+++ b/Source/WebCore/Android.mk
@@ -179,6 +179,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
dom/Range.cpp \
dom/RegisteredEventListener.cpp \
dom/ScopedEventQueue.cpp \
+ dom/ScriptedAnimationController.cpp \
dom/ScriptableDocumentParser.cpp \
dom/ScriptElement.cpp \
dom/ScriptExecutionContext.cpp \
@@ -247,7 +248,9 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
editing/ReplaceSelectionCommand.cpp \
editing/SelectionController.cpp \
editing/SetNodeAttributeCommand.cpp \
+ editing/SetSelectionCommand.cpp \
editing/SpellChecker.cpp \
+ editing/SpellingCorrectionCommand.cpp \
editing/SplitElementCommand.cpp \
editing/SplitTextNodeCommand.cpp \
editing/SplitTextNodeContainingElementCommand.cpp \
@@ -272,6 +275,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
fileapi/DirectoryEntrySync.cpp \
fileapi/DirectoryReaderSync.cpp \
fileapi/EntryArraySync.cpp \
+ fileapi/EntryBase.cpp \
fileapi/EntrySync.cpp \
fileapi/File.cpp \
fileapi/FileEntrySync.cpp \
@@ -372,11 +376,13 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
html/canvas/Int32Array.cpp \
html/canvas/Int8Array.cpp \
html/canvas/OESTextureFloat.cpp \
+ html/canvas/OESVertexArrayObject.cpp \
html/canvas/Uint16Array.cpp \
html/canvas/Uint32Array.cpp \
html/canvas/Uint8Array.cpp \
html/canvas/WebGLExtension.cpp \
html/canvas/WebGLObject.cpp \
+ html/canvas/WebGLVertexArrayObjectOES.cpp \
\
html/parser/HTMLConstructionSite.cpp \
html/parser/HTMLDocumentParser.cpp \
@@ -727,7 +733,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
platform/network/ResourceResponseBase.cpp \
\
platform/network/android/CookieJarAndroid.cpp \
- platform/network/android/NetworkStateNotifierAndroid.cpp \
platform/network/android/ProxyServerAndroid.cpp \
platform/network/android/ResourceHandleAndroid.cpp \
platform/network/android/ResourceRequestAndroid.cpp \
@@ -965,13 +970,13 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
storage/DatabaseThread.cpp \
storage/DatabaseTracker.cpp \
storage/IDBAny.cpp \
- storage/IDBCompleteEvent.cpp \
+ storage/IDBBackingStore.cpp \
storage/IDBCursor.cpp \
storage/IDBCursorBackendImpl.cpp \
+ storage/IDBCursorWithValue.cpp \
storage/IDBDatabase.cpp \
storage/IDBDatabaseBackendImpl.cpp \
- storage/IDBErrorEvent.cpp \
- storage/IDBEvent.cpp \
+ storage/IDBEventDispatcher.cpp \
storage/IDBFactory.cpp \
storage/IDBFactoryBackendInterface.cpp \
storage/IDBFactoryBackendImpl.cpp \
@@ -982,9 +987,9 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
storage/IDBObjectStore.cpp \
storage/IDBObjectStoreBackendImpl.cpp \
storage/IDBRequest.cpp \
- storage/IDBSQLiteDatabase.cpp \
- storage/IDBSuccessEvent.cpp \
storage/IDBTransaction.cpp \
+ storage/IDBVersionChangeEvent.cpp \
+ storage/IDBVersionChangeRequest.cpp \
storage/LocalStorageTask.cpp \
storage/LocalStorageThread.cpp \
storage/OriginQuotaManager.cpp \
@@ -1177,7 +1182,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
xml/XMLHttpRequest.cpp \
xml/XMLHttpRequestProgressEventThrottle.cpp \
xml/XMLHttpRequestUpload.cpp \
- xml/XMLSerializer.cpp
+ xml/XMLSerializer.cpp \
+ xml/XMLTreeViewer.cpp
# For XPath
LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \