mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
merge backout
This commit is contained in:
commit
95dc3871a4
@ -267,6 +267,10 @@ nsNavBookmarks::GetStatement(const nsCOMPtr<mozIStorageStatement>& aStmt)
|
|||||||
"SELECT COUNT(*), "
|
"SELECT COUNT(*), "
|
||||||
"(SELECT id FROM moz_bookmarks WHERE id = ?1) "
|
"(SELECT id FROM moz_bookmarks WHERE id = ?1) "
|
||||||
"FROM moz_bookmarks WHERE parent = ?1"));
|
"FROM moz_bookmarks WHERE parent = ?1"));
|
||||||
|
|
||||||
|
RETURN_IF_STMT(mDBGetItemIndex, NS_LITERAL_CSTRING(
|
||||||
|
"SELECT position FROM moz_bookmarks WHERE id = ?1"));
|
||||||
|
|
||||||
RETURN_IF_STMT(mDBGetChildAt, NS_LITERAL_CSTRING(
|
RETURN_IF_STMT(mDBGetChildAt, NS_LITERAL_CSTRING(
|
||||||
"SELECT id, fk, type FROM moz_bookmarks "
|
"SELECT id, fk, type FROM moz_bookmarks "
|
||||||
"WHERE parent = ?1 AND position = ?2"));
|
"WHERE parent = ?1 AND position = ?2"));
|
||||||
@ -441,6 +445,7 @@ nsNavBookmarks::FinalizeStatements() {
|
|||||||
mDBGetChildren,
|
mDBGetChildren,
|
||||||
mDBFindURIBookmarks,
|
mDBFindURIBookmarks,
|
||||||
mDBFolderCount,
|
mDBFolderCount,
|
||||||
|
mDBGetItemIndex,
|
||||||
mDBGetChildAt,
|
mDBGetChildAt,
|
||||||
mDBGetItemProperties,
|
mDBGetItemProperties,
|
||||||
mDBGetItemIdForGUID,
|
mDBGetItemIdForGUID,
|
||||||
@ -2863,7 +2868,7 @@ nsNavBookmarks::GetItemIndex(PRInt64 aItemId, PRInt32* _index)
|
|||||||
|
|
||||||
*_index = -1;
|
*_index = -1;
|
||||||
|
|
||||||
DECLARE_AND_ASSIGN_SCOPED_LAZY_STMT(stmt, mDBGetItemProperties);
|
DECLARE_AND_ASSIGN_SCOPED_LAZY_STMT(stmt, mDBGetItemIndex);
|
||||||
nsresult rv = stmt->BindInt64Parameter(0, aItemId);
|
nsresult rv = stmt->BindInt64Parameter(0, aItemId);
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
PRBool hasResult;
|
PRBool hasResult;
|
||||||
@ -2872,7 +2877,7 @@ nsNavBookmarks::GetItemIndex(PRInt64 aItemId, PRInt32* _index)
|
|||||||
if (!hasResult)
|
if (!hasResult)
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
|
||||||
rv = stmt->GetInt32(kGetItemPropertiesIndex_Position, _index);
|
rv = stmt->GetInt32(0, _index);
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
Loading…
Reference in New Issue
Block a user