5461f2587f09db45fac0a6f6e1b9c62f638aebc0 |
|
08-Jun-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r82507: Fix conflicts due to new StorageTracker - FileSystemAndroid.cpp, FileSystemPOSIX.cpp Use new common version of listDirectory(), which is identical to the existing Android version. - StorageNamespace.h, StorageNamespaceImpl.h Conflict due to Android's clearPage() - PageGroup.cpp Conflict due to Android's clearDomStorage() See http://trac.webkit.org/changeset/80892 Change-Id: Ifac131155f5019959de8761438cd0372547b0e6c
/external/webkit/Source/WebCore/storage/StorageNamespace.h
|