wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 865188 - Remove Storage support for profile special database. r=mak

Browse Source
This commit is contained in:
Roberta De Viti 2013-07-11 10:00:48 +02:00
parent 09be89a52e
commit 52924c0d96
5 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
profile/dirserviceprovider/src/nsProfileDirServiceProvider.cpp
View File

@ -23,7 +23,6 @@
#define BOOKMARKS_FILE_50_NAME NS_LITERAL_CSTRING("bookmarks.html")
#define DOWNLOADS_FILE_50_NAME NS_LITERAL_CSTRING("downloads.rdf")
#define SEARCH_FILE_50_NAME NS_LITERAL_CSTRING("search.rdf" )
#define STORAGE_FILE_50_NAME NS_LITERAL_CSTRING("storage.sdb")
//*****************************************************************************
// nsProfileDirServiceProvider::nsProfileDirServiceProvider
@ -226,11 +225,6 @@ nsProfileDirServiceProvider::GetFile(const char *prop, bool *persistant, nsIFile
rv = EnsureProfileFileExists(localFile, domainDir);
}
}
else if (strcmp(prop, NS_APP_STORAGE_50_FILE) == 0) {
rv = domainDir->Clone(getter_AddRefs(localFile));
if (NS_SUCCEEDED(rv))
rv = localFile->AppendNative(STORAGE_FILE_50_NAME);
}
if (localFile && NS_SUCCEEDED(rv))

3
storage/public/mozIStorageService.idl
View File

@ -76,7 +76,7 @@ interface mozIStorageService : nsISupports {
* Get a connection to a named special database storage.
*
* @param aStorageKey a string key identifying the type of storage
* requested. Valid values include: "profile", "memory".
* requested. Valid values include: "memory".
*
* @see openDatabase for restrictions on how database connections may be
* used. For the profile database, you should only access it from the main
@ -189,6 +189,5 @@ interface mozIStorageService : nsISupports {
%{C++
#define MOZ_STORAGE_MEMORY_STORAGE_KEY "memory"
#define MOZ_STORAGE_PROFILE_STORAGE_KEY "profile"
%}

10
storage/src/mozStorageService.cpp
View File

@ -619,9 +619,6 @@ Service::getLocaleCollation()
////////////////////////////////////////////////////////////////////////////////
//// mozIStorageService
#ifndef NS_APP_STORAGE_50_FILE
#define NS_APP_STORAGE_50_FILE "UStor"
#endif
NS_IMETHODIMP
Service::OpenSpecialDatabase(const char *aStorageKey,
@ -634,13 +631,6 @@ Service::OpenSpecialDatabase(const char *aStorageKey,
// just fall through with NULL storageFile, this will cause the storage
// connection to use a memory DB.
}
else if (::strcmp(aStorageKey, "profile") == 0) {
rv = NS_GetSpecialDirectory(NS_APP_STORAGE_50_FILE,
getter_AddRefs(storageFile));
NS_ENSURE_SUCCESS(rv, rv);
// fall through to DB initialization
}
else {
return NS_ERROR_INVALID_ARG;
}

3
toolkit/xre/nsXREDirProvider.cpp
View File

@ -419,9 +419,6 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
EnsureProfileFileExists(file);
ensureFilePermissions = true;
}
else if (!strcmp(aProperty, NS_APP_STORAGE_50_FILE)) {
rv = file->AppendNative(NS_LITERAL_CSTRING("storage.sdb"));
}
else if (!strcmp(aProperty, NS_APP_DOWNLOADS_50_FILE)) {
rv = file->AppendNative(NS_LITERAL_CSTRING("downloads.rdf"));
}

2
xpcom/io/nsAppDirectoryServiceDefs.h
View File

@ -85,8 +85,6 @@
#define NS_APP_INSTALL_CLEANUP_DIR "XPIClnupD" //location of xpicleanup.dat xpicleanup.exe
#define NS_APP_STORAGE_50_FILE "UStor" // sqlite database used as mozStorage profile db
#define NS_APP_INDEXEDDB_PARENT_DIR "indexedDBPDir"
#define NS_APP_PERMISSION_PARENT_DIR "permissionDBPDir"