зеркало из https://github.com/mozilla/gecko-dev.git
merge backout
This commit is contained in:
Коммит
536bc04793
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
@ -136,6 +136,7 @@ private:
|
||||||
|
|
||||||
nsresult InitRoots();
|
nsresult InitRoots();
|
||||||
nsresult InitDefaults();
|
nsresult InitDefaults();
|
||||||
|
nsresult InitStatements();
|
||||||
nsresult CreateRoot(mozIStorageStatement* aGetRootStatement,
|
nsresult CreateRoot(mozIStorageStatement* aGetRootStatement,
|
||||||
const nsCString& name,
|
const nsCString& name,
|
||||||
PRInt64* aID,
|
PRInt64* aID,
|
||||||
|
@ -281,21 +282,15 @@ private:
|
||||||
nsresult GetBookmarkIdsForURITArray(nsIURI* aURI,
|
nsresult GetBookmarkIdsForURITArray(nsIURI* aURI,
|
||||||
nsTArray<PRInt64>& aResult);
|
nsTArray<PRInt64>& aResult);
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* You should always use this getter and never use directly the nsCOMPtr.
|
|
||||||
*/
|
|
||||||
mozIStorageStatement* GetStatement(const nsCOMPtr<mozIStorageStatement>& aStmt);
|
|
||||||
|
|
||||||
nsCOMPtr<mozIStorageStatement> mDBGetChildren;
|
|
||||||
// kGetInfoIndex_* results + kGetChildrenIndex_* results
|
// kGetInfoIndex_* results + kGetChildrenIndex_* results
|
||||||
|
nsCOMPtr<mozIStorageStatement> mDBGetChildren;
|
||||||
static const PRInt32 kGetChildrenIndex_Position;
|
static const PRInt32 kGetChildrenIndex_Position;
|
||||||
static const PRInt32 kGetChildrenIndex_Type;
|
static const PRInt32 kGetChildrenIndex_Type;
|
||||||
static const PRInt32 kGetChildrenIndex_PlaceID;
|
static const PRInt32 kGetChildrenIndex_PlaceID;
|
||||||
static const PRInt32 kGetChildrenIndex_FolderTitle;
|
static const PRInt32 kGetChildrenIndex_FolderTitle;
|
||||||
static const PRInt32 kGetChildrenIndex_ServiceContractId;
|
static const PRInt32 kGetChildrenIndex_ServiceContractId;
|
||||||
|
|
||||||
nsCOMPtr<mozIStorageStatement> mDBFindURIBookmarks;
|
nsCOMPtr<mozIStorageStatement> mDBFindURIBookmarks; // kFindBookmarksIndex_* results
|
||||||
static const PRInt32 kFindBookmarksIndex_ID;
|
static const PRInt32 kFindBookmarksIndex_ID;
|
||||||
static const PRInt32 kFindBookmarksIndex_Type;
|
static const PRInt32 kFindBookmarksIndex_Type;
|
||||||
static const PRInt32 kFindBookmarksIndex_PlaceID;
|
static const PRInt32 kFindBookmarksIndex_PlaceID;
|
||||||
|
@ -303,9 +298,14 @@ private:
|
||||||
static const PRInt32 kFindBookmarksIndex_Position;
|
static const PRInt32 kFindBookmarksIndex_Position;
|
||||||
static const PRInt32 kFindBookmarksIndex_Title;
|
static const PRInt32 kFindBookmarksIndex_Title;
|
||||||
|
|
||||||
nsCOMPtr<mozIStorageStatement> mDBGetItemProperties;
|
nsCOMPtr<mozIStorageStatement> mDBFolderCount;
|
||||||
|
|
||||||
|
nsCOMPtr<mozIStorageStatement> mDBGetItemIndex;
|
||||||
|
nsCOMPtr<mozIStorageStatement> mDBGetChildAt;
|
||||||
|
|
||||||
|
nsCOMPtr<mozIStorageStatement> mDBGetItemProperties; // kGetItemPropertiesIndex_*
|
||||||
static const PRInt32 kGetItemPropertiesIndex_ID;
|
static const PRInt32 kGetItemPropertiesIndex_ID;
|
||||||
static const PRInt32 kGetItemPropertiesIndex_URI;
|
static const PRInt32 kGetItemPropertiesIndex_URI; // null for folders and separators
|
||||||
static const PRInt32 kGetItemPropertiesIndex_Title;
|
static const PRInt32 kGetItemPropertiesIndex_Title;
|
||||||
static const PRInt32 kGetItemPropertiesIndex_Position;
|
static const PRInt32 kGetItemPropertiesIndex_Position;
|
||||||
static const PRInt32 kGetItemPropertiesIndex_PlaceID;
|
static const PRInt32 kGetItemPropertiesIndex_PlaceID;
|
||||||
|
@ -315,6 +315,9 @@ private:
|
||||||
static const PRInt32 kGetItemPropertiesIndex_DateAdded;
|
static const PRInt32 kGetItemPropertiesIndex_DateAdded;
|
||||||
static const PRInt32 kGetItemPropertiesIndex_LastModified;
|
static const PRInt32 kGetItemPropertiesIndex_LastModified;
|
||||||
|
|
||||||
|
nsCOMPtr<mozIStorageStatement> mDBGetItemIdForGUID;
|
||||||
|
nsCOMPtr<mozIStorageStatement> mDBGetRedirectDestinations;
|
||||||
|
|
||||||
nsCOMPtr<mozIStorageStatement> mDBInsertBookmark;
|
nsCOMPtr<mozIStorageStatement> mDBInsertBookmark;
|
||||||
static const PRInt32 kInsertBookmarkIndex_Id;
|
static const PRInt32 kInsertBookmarkIndex_Id;
|
||||||
static const PRInt32 kInsertBookmarkIndex_PlaceId;
|
static const PRInt32 kInsertBookmarkIndex_PlaceId;
|
||||||
|
@ -326,20 +329,23 @@ private:
|
||||||
static const PRInt32 kInsertBookmarkIndex_DateAdded;
|
static const PRInt32 kInsertBookmarkIndex_DateAdded;
|
||||||
static const PRInt32 kInsertBookmarkIndex_LastModified;
|
static const PRInt32 kInsertBookmarkIndex_LastModified;
|
||||||
|
|
||||||
nsCOMPtr<mozIStorageStatement> mDBFolderCount;
|
|
||||||
nsCOMPtr<mozIStorageStatement> mDBGetItemIndex;
|
|
||||||
nsCOMPtr<mozIStorageStatement> mDBGetChildAt;
|
|
||||||
nsCOMPtr<mozIStorageStatement> mDBGetItemIdForGUID;
|
|
||||||
nsCOMPtr<mozIStorageStatement> mDBGetRedirectDestinations;
|
|
||||||
nsCOMPtr<mozIStorageStatement> mDBIsBookmarkedInDatabase;
|
nsCOMPtr<mozIStorageStatement> mDBIsBookmarkedInDatabase;
|
||||||
nsCOMPtr<mozIStorageStatement> mDBIsRealBookmark;
|
nsCOMPtr<mozIStorageStatement> mDBIsRealBookmark;
|
||||||
nsCOMPtr<mozIStorageStatement> mDBGetLastBookmarkID;
|
nsCOMPtr<mozIStorageStatement> mDBGetLastBookmarkID;
|
||||||
nsCOMPtr<mozIStorageStatement> mDBSetItemDateAdded;
|
nsCOMPtr<mozIStorageStatement> mDBSetItemDateAdded;
|
||||||
nsCOMPtr<mozIStorageStatement> mDBSetItemLastModified;
|
nsCOMPtr<mozIStorageStatement> mDBSetItemLastModified;
|
||||||
nsCOMPtr<mozIStorageStatement> mDBSetItemIndex;
|
nsCOMPtr<mozIStorageStatement> mDBSetItemIndex;
|
||||||
|
|
||||||
|
// keywords
|
||||||
nsCOMPtr<mozIStorageStatement> mDBGetKeywordForURI;
|
nsCOMPtr<mozIStorageStatement> mDBGetKeywordForURI;
|
||||||
nsCOMPtr<mozIStorageStatement> mDBGetKeywordForBookmark;
|
nsCOMPtr<mozIStorageStatement> mDBGetKeywordForBookmark;
|
||||||
nsCOMPtr<mozIStorageStatement> mDBGetURIForKeyword;
|
nsCOMPtr<mozIStorageStatement> mDBGetURIForKeyword;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* For the next statements you should always use this getter and never use
|
||||||
|
* directly the statement nsCOMPtr.
|
||||||
|
*/
|
||||||
|
mozIStorageStatement* GetStatement(const nsCOMPtr<mozIStorageStatement>& aStmt);
|
||||||
nsCOMPtr<mozIStorageStatement> mDBAdjustPosition;
|
nsCOMPtr<mozIStorageStatement> mDBAdjustPosition;
|
||||||
nsCOMPtr<mozIStorageStatement> mDBRemoveItem;
|
nsCOMPtr<mozIStorageStatement> mDBRemoveItem;
|
||||||
nsCOMPtr<mozIStorageStatement> mDBGetLastChildId;
|
nsCOMPtr<mozIStorageStatement> mDBGetLastChildId;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче