From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 25 May 2011 19:08:45 +0100 Subject: Merge WebKit at r82507: Initial merge by git Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e --- Source/WebCore/Android.mk | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'Source/WebCore/Android.mk') diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk index b2ad8f4..f7ecf6d 100644 --- a/Source/WebCore/Android.mk +++ b/Source/WebCore/Android.mk @@ -101,7 +101,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ css/WebKitCSSTransformValue.cpp \ \ dom/ActiveDOMObject.cpp \ - dom/AsyncScriptRunner.cpp \ dom/Attr.cpp \ dom/Attribute.cpp \ dom/BeforeTextInsertedEvent.cpp \ @@ -122,8 +121,12 @@ 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 \ @@ -141,6 +144,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ dom/ErrorEvent.cpp \ dom/Event.cpp \ dom/EventContext.cpp \ + dom/EventDispatcher.cpp \ dom/EventNames.cpp \ dom/EventTarget.cpp \ dom/EventQueue.cpp \ @@ -183,11 +187,13 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ dom/ScriptableDocumentParser.cpp \ dom/ScriptElement.cpp \ dom/ScriptExecutionContext.cpp \ + dom/ScriptRunner.cpp \ dom/SelectElement.cpp \ dom/SelectorNodeList.cpp \ dom/SpaceSplitString.cpp \ dom/StaticHashSetNodeList.cpp \ dom/StaticNodeList.cpp \ + dom/StringCallback.cpp \ dom/StyleElement.cpp \ dom/StyledElement.cpp \ dom/TagNodeList.cpp \ @@ -460,6 +466,11 @@ 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 \ @@ -507,6 +518,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ page/SpeechInputResult.cpp \ page/SuspendableTimer.cpp \ page/UserContentURLPattern.cpp \ + page/WebKitAnimation.cpp \ + page/WebKitAnimationList.cpp \ page/WindowFeatures.cpp \ page/WorkerNavigator.cpp \ \ @@ -523,7 +536,11 @@ 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 \ -- cgit v1.1 From bafa44a9b9f47c1487cf18754bbcc6292c372fb6 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 7 Jun 2011 15:47:53 +0100 Subject: Merge WebKit at r82507: Fix makefiles Change-Id: Ia541ed77797442b5894b6fb88b3b829cc59c3535 --- Source/WebCore/Android.mk | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'Source/WebCore/Android.mk') 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) \ -- cgit v1.1