tor-browser

commit 2cbee83350a337a86a537b582c6e0fc510c57f10
parent 583e83c688f1d7634aba71d4fe4dec2df0b0adf0
Author: Daisuke Akatsuka <daisuke@birchill.co.jp>
Date:   Fri, 21 Nov 2025 06:13:49 +0000

Bug 1846461: Remove FetchItemInfo(guid) from nsNavBookmarks r=places-reviewers,mak

Differential Revision: https://phabricator.services.mozilla.com/D273159

Diffstat:
M
toolkit/components/places/nsNavBookmarks.cpp
 | 
68
--------------------------------------------------------------------
M
toolkit/components/places/nsNavBookmarks.h
 | 
10
----------

2 files changed, 0 insertions(+), 78 deletions(-)
diff --git a/toolkit/components/places/nsNavBookmarks.cpp b/toolkit/components/places/nsNavBookmarks.cpp
@@ -1086,74 +1086,6 @@ nsresult nsNavBookmarks::FetchItemInfo(int64_t aItemId,
   return NS_OK;
 }
 
-nsresult nsNavBookmarks::FetchItemInfo(const nsCString& aGUID,
-                                       BookmarkData& _bookmark) {
-  // LEFT JOIN since not all bookmarks have an associated place.
-  nsCOMPtr<mozIStorageStatement> stmt = mDB->GetStatement(
-      "SELECT b.id, h.url, b.title, b.position, b.fk, b.parent, b.type, "
-      "b.dateAdded, b.lastModified, t.guid, t.parent, "
-      "b.syncStatus "
-      "FROM moz_bookmarks b "
-      "LEFT JOIN moz_bookmarks t ON t.id = b.parent "
-      "LEFT JOIN moz_places h ON h.id = b.fk "
-      "WHERE b.guid = :item_guid");
-  NS_ENSURE_STATE(stmt);
-  mozStorageStatementScoper scoper(stmt);
-
-  nsresult rv = stmt->BindUTF8StringByName("item_guid"_ns, aGUID);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  _bookmark.guid = aGUID;
-
-  bool hasResult;
-  rv = stmt->ExecuteStep(&hasResult);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (!hasResult) {
-    return NS_ERROR_INVALID_ARG;
-  }
-
-  rv = stmt->GetInt64(0, &_bookmark.id);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = stmt->GetUTF8String(1, _bookmark.url);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  bool isNull;
-  rv = stmt->GetIsNull(2, &isNull);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (!isNull) {
-    rv = stmt->GetUTF8String(2, _bookmark.title);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-  rv = stmt->GetInt32(3, &_bookmark.position);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = stmt->GetInt64(4, &_bookmark.placeId);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = stmt->GetInt64(5, &_bookmark.parentId);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = stmt->GetInt32(6, &_bookmark.type);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = stmt->GetInt64(7, reinterpret_cast<int64_t*>(&_bookmark.dateAdded));
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = stmt->GetInt64(8, reinterpret_cast<int64_t*>(&_bookmark.lastModified));
-  NS_ENSURE_SUCCESS(rv, rv);
-  // Getting properties of the root would show no parent.
-  rv = stmt->GetIsNull(9, &isNull);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (!isNull) {
-    rv = stmt->GetUTF8String(9, _bookmark.parentGuid);
-    NS_ENSURE_SUCCESS(rv, rv);
-    rv = stmt->GetInt64(10, &_bookmark.grandParentId);
-    NS_ENSURE_SUCCESS(rv, rv);
-  } else {
-    _bookmark.grandParentId = -1;
-  }
-  rv = stmt->GetInt32(11, &_bookmark.syncStatus);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
 nsresult nsNavBookmarks::SetItemDateInternal(enum BookmarkDate aDateType,
                                              int64_t aSyncChangeDelta,
                                              int64_t aItemId, PRTime aValue) {
diff --git a/toolkit/components/places/nsNavBookmarks.h b/toolkit/components/places/nsNavBookmarks.h
@@ -112,16 +112,6 @@ class nsNavBookmarks final : public nsINavBookmarksService,
   nsresult FetchItemInfo(int64_t aItemId, BookmarkData& _bookmark);
 
   /**
-   * Fetches information about the specified GUID from the database.
-   *
-   * @param aGUID
-   *        GUID of the item to fetch information for.
-   * @param aBookmark
-   *        BookmarkData to store the information.
-   */
-  nsresult FetchItemInfo(const nsCString& aGUID, BookmarkData& _bookmark);
-
-  /**
    * Notifies that a bookmark has been visited.
    *
    * @param aItemId