diff options
| author | Feng Qian <fqian@google.com> | 2009-06-18 14:00:49 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-18 14:00:49 -0700 |
| commit | c9c4d65c1547996ed3748026904d6e7f09aec2b4 (patch) | |
| tree | 5298ee7f87a0f97f06d5b2e66c37dedd88238ccf /WebCore/Android.mk | |
| parent | ad9f76210e4cbae75d762b7a65b39af424879b6b (diff) | |
| parent | 36747fa778285f57f2f53c047028be83e9d8776d (diff) | |
| download | external_webkit-c9c4d65c1547996ed3748026904d6e7f09aec2b4.zip external_webkit-c9c4d65c1547996ed3748026904d6e7f09aec2b4.tar.gz external_webkit-c9c4d65c1547996ed3748026904d6e7f09aec2b4.tar.bz2 | |
Merge commit 'goog/master' into webkit_merge
Resolved conflicts:
WebCore/Android.mk
WebCore/storage/LocalStorageArea.h
WebCore/storage/SessionStorageArea.cpp
WebCore/storage/StorageEvent.cpp
Diffstat (limited to 'WebCore/Android.mk')
| -rw-r--r-- | WebCore/Android.mk | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/WebCore/Android.mk b/WebCore/Android.mk index bcb8b58..8ecb7e0 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -26,7 +26,6 @@ # bindings/js/JSCustomVersionChangeCallback.cpp \ # bindings/js/JSHTMLAudioElementConstructor.cpp \ # bindings/js/JSInspectorControllerCustom.cpp \ -# bindings/js/JSStorageCustom.cpp \ # bindings/js/JSXSLTProcessor*.cpp \ # bindings/js/JSWorker*.cpp \ # bindings/js/Worker*.cpp \ @@ -189,7 +188,8 @@ LOCAL_SRC_FILES := \ bindings/js/JSQuarantinedObjectWrapper.cpp \ bindings/js/JSRGBColor.cpp \ bindings/js/JSSQLResultSetRowListCustom.cpp \ - bindings/js/JSSQLTransactionCustom.cpp + bindings/js/JSSQLTransactionCustom.cpp \ + bindings/js/JSStorageCustom.cpp \ ifeq ($(ENABLE_SVG), true) LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ @@ -661,6 +661,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/android/SearchPopupMenuAndroid.cpp \ platform/android/SharedTimerAndroid.cpp \ platform/android/SoundAndroid.cpp \ + platform/android/SSLKeyGeneratorAndroid.cpp \ platform/android/SystemTimeAndroid.cpp \ platform/android/TemporaryLinkStubs.cpp \ platform/android/WidgetAndroid.cpp \ @@ -955,12 +956,22 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ storage/DatabaseTask.cpp \ storage/DatabaseThread.cpp \ storage/DatabaseTracker.cpp \ + storage/LocalStorage.cpp \ + storage/LocalStorageArea.cpp \ + storage/LocalStorageTask.cpp \ + storage/LocalStorageThread.cpp \ storage/OriginQuotaManager.cpp \ + storage/SessionStorage.cpp \ + storage/SessionStorageArea.cpp \ storage/OriginUsageRecord.cpp \ storage/SQLResultSet.cpp \ storage/SQLResultSetRowList.cpp \ storage/SQLStatement.cpp \ storage/SQLTransaction.cpp \ + storage/Storage.cpp \ + storage/StorageArea.cpp \ + storage/StorageEvent.cpp \ + storage/StorageMap.cpp \ ifeq ($(ENABLE_SVG), true) LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ |