mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-25 11:15:34 +00:00
Backed out changeset 3049f6d7bb50
This commit is contained in:
parent
86a04c5493
commit
0cde9fff88
@ -1210,9 +1210,8 @@ nsNavBookmarks::InsertBookmark(PRInt64 aFolder,
|
||||
rv = AddBookmarkToHash(childID, 0);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemAdded(*aNewBookmarkId, aFolder, index, TYPE_BOOKMARK));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemAdded(*aNewBookmarkId, aFolder, index, TYPE_BOOKMARK));
|
||||
|
||||
// If the bookmark has been added to a tag container, notify all
|
||||
// bookmark-folder result nodes which contain a bookmark for the new
|
||||
@ -1228,11 +1227,13 @@ nsNavBookmarks::InsertBookmark(PRInt64 aFolder,
|
||||
|
||||
if (bookmarks.Length()) {
|
||||
for (PRUint32 i = 0; i < bookmarks.Length(); i++) {
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemChanged(bookmarks[i], NS_LITERAL_CSTRING("tags"),
|
||||
PR_FALSE, EmptyCString(), 0,
|
||||
TYPE_BOOKMARK));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemChanged(bookmarks[i],
|
||||
NS_LITERAL_CSTRING("tags"),
|
||||
PR_FALSE,
|
||||
EmptyCString(),
|
||||
0,
|
||||
TYPE_BOOKMARK));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1283,9 +1284,8 @@ nsNavBookmarks::RemoveItem(PRInt64 aItemId)
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnBeforeItemRemoved(aItemId, itemType));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnBeforeItemRemoved(aItemId, itemType));
|
||||
|
||||
mozStorageTransaction transaction(mDBConn, PR_FALSE);
|
||||
|
||||
@ -1328,9 +1328,8 @@ nsNavBookmarks::RemoveItem(PRInt64 aItemId)
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
}
|
||||
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemRemoved(aItemId, folderId, childIndex, itemType));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemRemoved(aItemId, folderId, childIndex, itemType));
|
||||
|
||||
if (itemType == TYPE_BOOKMARK) {
|
||||
// If the removed bookmark was a child of a tag container, notify all
|
||||
@ -1350,11 +1349,13 @@ nsNavBookmarks::RemoveItem(PRInt64 aItemId)
|
||||
|
||||
if (bookmarks.Length()) {
|
||||
for (PRUint32 i = 0; i < bookmarks.Length(); i++) {
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemChanged(bookmarks[i],
|
||||
NS_LITERAL_CSTRING("tags"), PR_FALSE,
|
||||
EmptyCString(), 0, TYPE_BOOKMARK));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemChanged(bookmarks[i],
|
||||
NS_LITERAL_CSTRING("tags"),
|
||||
PR_FALSE,
|
||||
EmptyCString(),
|
||||
0,
|
||||
TYPE_BOOKMARK));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1475,9 +1476,8 @@ nsNavBookmarks::CreateContainerWithID(PRInt64 aItemId,
|
||||
rv = transaction.Commit();
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemAdded(*aNewFolder, aParent, index, containerType));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemAdded(*aNewFolder, aParent, index, containerType));
|
||||
|
||||
*aIndex = index;
|
||||
return NS_OK;
|
||||
@ -1521,9 +1521,8 @@ nsNavBookmarks::InsertSeparator(PRInt64 aParent,
|
||||
rv = transaction.Commit();
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemAdded(*aNewItemId, aParent, index, TYPE_SEPARATOR));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemAdded(*aNewItemId, aParent, index, TYPE_SEPARATOR));
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
@ -1614,9 +1613,8 @@ nsNavBookmarks::RemoveFolder(PRInt64 aFolderId)
|
||||
{
|
||||
NS_ENSURE_TRUE(aFolderId != mRoot, NS_ERROR_INVALID_ARG);
|
||||
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnBeforeItemRemoved(aFolderId, TYPE_FOLDER));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnBeforeItemRemoved(aFolderId, TYPE_FOLDER));
|
||||
|
||||
mozStorageTransaction transaction(mDBConn, PR_FALSE);
|
||||
|
||||
@ -1694,9 +1692,8 @@ nsNavBookmarks::RemoveFolder(PRInt64 aFolderId)
|
||||
mToolbarFolder = 0;
|
||||
}
|
||||
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemRemoved(aFolderId, parent, index, TYPE_FOLDER));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemRemoved(aFolderId, parent, index, TYPE_FOLDER));
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
@ -1827,9 +1824,8 @@ nsNavBookmarks::RemoveFolderChildren(PRInt64 aFolderId)
|
||||
folderChildrenInfo child = folderChildrenArray[i];
|
||||
|
||||
// Notify observers that we are about to remove this child.
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnBeforeItemRemoved(child.itemId, child.itemType));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnBeforeItemRemoved(child.itemId, child.itemType));
|
||||
|
||||
if (child.itemType == TYPE_FOLDER) {
|
||||
foldersToRemove.AppendLiteral(",");
|
||||
@ -1904,10 +1900,11 @@ nsNavBookmarks::RemoveFolderChildren(PRInt64 aFolderId)
|
||||
for (PRInt32 i = folderChildrenArray.Length() - 1; i >= 0 ; i--) {
|
||||
folderChildrenInfo child = folderChildrenArray[i];
|
||||
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemRemoved(child.itemId, child.parentId, child.index,
|
||||
child.itemType));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemRemoved(child.itemId,
|
||||
child.parentId,
|
||||
child.index,
|
||||
child.itemType));
|
||||
|
||||
if (child.itemType == TYPE_BOOKMARK) {
|
||||
// If the removed bookmark was a child of a tag container, notify all
|
||||
@ -1925,11 +1922,13 @@ nsNavBookmarks::RemoveFolderChildren(PRInt64 aFolderId)
|
||||
|
||||
if (bookmarks.Length()) {
|
||||
for (PRUint32 i = 0; i < bookmarks.Length(); i++) {
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemChanged(bookmarks[i],
|
||||
NS_LITERAL_CSTRING("tags"), PR_FALSE,
|
||||
EmptyCString(), 0, TYPE_BOOKMARK));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemChanged(bookmarks[i],
|
||||
NS_LITERAL_CSTRING("tags"),
|
||||
PR_FALSE,
|
||||
EmptyCString(),
|
||||
0,
|
||||
TYPE_BOOKMARK));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2096,10 +2095,10 @@ nsNavBookmarks::MoveItem(PRInt64 aItemId, PRInt64 aNewParent, PRInt32 aIndex)
|
||||
rv = transaction.Commit();
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemMoved(aItemId, oldParent, oldIndex, aNewParent,
|
||||
newIndex, itemType));
|
||||
// notify bookmark observers
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemMoved(aItemId, oldParent, oldIndex, aNewParent,
|
||||
newIndex, itemType));
|
||||
|
||||
// notify dynamic container provider if there is one
|
||||
if (!folderType.IsEmpty()) {
|
||||
@ -2150,12 +2149,12 @@ nsNavBookmarks::SetItemDateAdded(PRInt64 aItemId, PRTime aDateAdded)
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
// Note: mDBSetItemDateAdded also sets lastModified to aDateAdded.
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemChanged(aItemId, NS_LITERAL_CSTRING("dateAdded"),
|
||||
PR_FALSE,
|
||||
nsPrintfCString(16, "%lld", aDateAdded),
|
||||
aDateAdded, itemType));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemChanged(aItemId, NS_LITERAL_CSTRING("dateAdded"),
|
||||
PR_FALSE,
|
||||
nsPrintfCString(16, "%lld", aDateAdded),
|
||||
aDateAdded,
|
||||
itemType));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@ -2194,12 +2193,13 @@ nsNavBookmarks::SetItemLastModified(PRInt64 aItemId, PRTime aLastModified)
|
||||
aItemId, aLastModified);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemChanged(aItemId, NS_LITERAL_CSTRING("lastModified"),
|
||||
PR_FALSE,
|
||||
nsPrintfCString(16, "%lld", aLastModified),
|
||||
aLastModified, itemType));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemChanged(aItemId,
|
||||
NS_LITERAL_CSTRING("lastModified"),
|
||||
PR_FALSE,
|
||||
nsPrintfCString(16, "%lld", aLastModified),
|
||||
aLastModified,
|
||||
itemType));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@ -2342,10 +2342,13 @@ nsNavBookmarks::SetItemTitle(PRInt64 aItemId, const nsACString& aTitle)
|
||||
rv = statement->Execute();
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemChanged(aItemId, NS_LITERAL_CSTRING("title"), PR_FALSE,
|
||||
aTitle, lastModified, itemType));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemChanged(aItemId,
|
||||
NS_LITERAL_CSTRING("title"),
|
||||
PR_FALSE,
|
||||
aTitle,
|
||||
lastModified,
|
||||
itemType));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@ -2769,10 +2772,9 @@ nsNavBookmarks::ChangeBookmarkURI(PRInt64 aBookmarkId, nsIURI* aNewURI)
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
// Pass the new URI to OnItemChanged.
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemChanged(aBookmarkId, NS_LITERAL_CSTRING("uri"),
|
||||
PR_FALSE, spec, lastModified, TYPE_BOOKMARK));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemChanged(aBookmarkId, NS_LITERAL_CSTRING("uri"), PR_FALSE, spec,
|
||||
lastModified, TYPE_BOOKMARK));
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
@ -2932,10 +2934,9 @@ nsNavBookmarks::SetItemIndex(PRInt64 aItemId, PRInt32 aNewIndex)
|
||||
rv = stmt->Execute();
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemMoved(aItemId, parent, oldIndex, parent, aNewIndex,
|
||||
itemType));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemMoved(aItemId, parent, oldIndex, parent,
|
||||
aNewIndex, itemType));
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
@ -3024,11 +3025,10 @@ nsNavBookmarks::SetKeywordForBookmark(PRInt64 aBookmarkId,
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
// Pass the new keyword to OnItemChanged.
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemChanged(aBookmarkId, NS_LITERAL_CSTRING("keyword"),
|
||||
PR_FALSE, NS_ConvertUTF16toUTF8(aKeyword),
|
||||
lastModified, TYPE_BOOKMARK));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemChanged(aBookmarkId, NS_LITERAL_CSTRING("keyword"),
|
||||
PR_FALSE, NS_ConvertUTF16toUTF8(aKeyword),
|
||||
lastModified, TYPE_BOOKMARK));
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
@ -3124,8 +3124,8 @@ nsNavBookmarks::BeginUpdateBatch()
|
||||
if (mBatchHasTransaction)
|
||||
conn->BeginTransaction();
|
||||
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver, OnBeginUpdateBatch());
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnBeginUpdateBatch());
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
@ -3138,8 +3138,8 @@ nsNavBookmarks::EndUpdateBatch()
|
||||
if (mBatchHasTransaction)
|
||||
mDBConn->CommitTransaction();
|
||||
mBatchHasTransaction = PR_FALSE;
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver, OnEndUpdateBatch());
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnEndUpdateBatch());
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
@ -3209,9 +3209,8 @@ nsNavBookmarks::OnVisit(nsIURI* aURI, PRInt64 aVisitID, PRTime aTime,
|
||||
|
||||
if (bookmarks.Length()) {
|
||||
for (PRUint32 i = 0; i < bookmarks.Length(); i++)
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemVisited(bookmarks[i], aVisitID, aTime));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemVisited(bookmarks[i], aVisitID, aTime));
|
||||
}
|
||||
}
|
||||
return NS_OK;
|
||||
@ -3240,12 +3239,13 @@ nsNavBookmarks::OnDeleteURI(nsIURI* aURI)
|
||||
|
||||
if (bookmarks.Length()) {
|
||||
for (PRUint32 i = 0; i < bookmarks.Length(); i ++)
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemChanged(bookmarks[i],
|
||||
NS_LITERAL_CSTRING("cleartime"),
|
||||
PR_FALSE, EmptyCString(), 0,
|
||||
TYPE_BOOKMARK));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemChanged(bookmarks[i],
|
||||
NS_LITERAL_CSTRING("cleartime"),
|
||||
PR_FALSE,
|
||||
EmptyCString(),
|
||||
0,
|
||||
TYPE_BOOKMARK));
|
||||
}
|
||||
}
|
||||
return NS_OK;
|
||||
@ -3295,13 +3295,13 @@ nsNavBookmarks::OnPageChanged(nsIURI* aURI, PRUint32 aWhat,
|
||||
NS_ENSURE_STATE(queries.Count() == 1);
|
||||
NS_ENSURE_STATE(queries[0]->Folders().Length() == 1);
|
||||
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemChanged(queries[0]->Folders()[0],
|
||||
NS_LITERAL_CSTRING("favicon"),
|
||||
PR_FALSE,
|
||||
NS_ConvertUTF16toUTF8(aValue),
|
||||
0, TYPE_BOOKMARK));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemChanged(queries[0]->Folders()[0],
|
||||
NS_LITERAL_CSTRING("favicon"),
|
||||
PR_FALSE,
|
||||
NS_ConvertUTF16toUTF8(aValue),
|
||||
0,
|
||||
TYPE_BOOKMARK));
|
||||
}
|
||||
else {
|
||||
// query for all bookmarks for that URI, notify for each
|
||||
@ -3311,13 +3311,13 @@ nsNavBookmarks::OnPageChanged(nsIURI* aURI, PRUint32 aWhat,
|
||||
|
||||
if (bookmarks.Length()) {
|
||||
for (PRUint32 i = 0; i < bookmarks.Length(); i ++)
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemChanged(bookmarks[i],
|
||||
NS_LITERAL_CSTRING("favicon"),
|
||||
PR_FALSE,
|
||||
NS_ConvertUTF16toUTF8(aValue),
|
||||
0, TYPE_BOOKMARK));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavBookmarkObserver,
|
||||
OnItemChanged(bookmarks[i],
|
||||
NS_LITERAL_CSTRING("favicon"),
|
||||
PR_FALSE,
|
||||
NS_ConvertUTF16toUTF8(aValue),
|
||||
0,
|
||||
TYPE_BOOKMARK));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -3355,10 +3355,10 @@ nsNavBookmarks::OnItemAnnotationSet(PRInt64 aItemId, const nsACString& aName)
|
||||
aItemId, lastModified);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemChanged(aItemId, aName, PR_TRUE, EmptyCString(),
|
||||
lastModified, itemType));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemChanged(aItemId, aName, PR_TRUE, EmptyCString(),
|
||||
lastModified, itemType));
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
@ -3384,10 +3384,10 @@ nsNavBookmarks::OnItemAnnotationRemoved(PRInt64 aItemId, const nsACString& aName
|
||||
aItemId, lastModified);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemChanged(aItemId, aName, PR_TRUE, EmptyCString(),
|
||||
lastModified, itemType));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavBookmarkObserver,
|
||||
OnItemChanged(aItemId, aName, PR_TRUE, EmptyCString(),
|
||||
lastModified, itemType));
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
@ -2782,10 +2782,9 @@ nsNavHistory::AddVisit(nsIURI* aURI, PRTime aTime, nsIURI* aReferringURI,
|
||||
PRUint32 added = 0;
|
||||
if (!hidden && aTransitionType != TRANSITION_EMBED &&
|
||||
aTransitionType != TRANSITION_DOWNLOAD) {
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavHistoryObserver,
|
||||
OnVisit(aURI, *aVisitID, aTime, aSessionID,
|
||||
referringVisitID, aTransitionType, &added));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavHistoryObserver,
|
||||
OnVisit(aURI, *aVisitID, aTime, aSessionID,
|
||||
referringVisitID, aTransitionType, &added));
|
||||
}
|
||||
|
||||
// Normally docshell sends the link visited observer notification for us (this
|
||||
@ -4220,8 +4219,8 @@ nsNavHistory::BeginUpdateBatch()
|
||||
if (mBatchHasTransaction)
|
||||
mDBConn->BeginTransaction();
|
||||
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavHistoryObserver, OnBeginUpdateBatch());
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavHistoryObserver,
|
||||
OnBeginUpdateBatch());
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
@ -4234,8 +4233,8 @@ nsNavHistory::EndUpdateBatch()
|
||||
if (mBatchHasTransaction)
|
||||
mDBConn->CommitTransaction();
|
||||
mBatchHasTransaction = PR_FALSE;
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavHistoryObserver, OnEndUpdateBatch());
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavHistoryObserver,
|
||||
OnEndUpdateBatch());
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
@ -4548,16 +4547,16 @@ nsNavHistory::RemovePage(nsIURI *aURI)
|
||||
NS_ENSURE_ARG(aURI);
|
||||
|
||||
// Before we remove, we have to notify our observers!
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavHistoryObserver, OnBeforeDeleteURI(aURI));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavHistoryObserver, OnBeforeDeleteURI(aURI));
|
||||
|
||||
nsIURI** URIs = &aURI;
|
||||
nsresult rv = RemovePages(URIs, 1, PR_FALSE);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
// Notify our observers that the URI has been removed.
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavHistoryObserver, OnDeleteURI(aURI));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavHistoryObserver, OnDeleteURI(aURI));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@ -4880,8 +4879,8 @@ nsNavHistory::RemoveAllPages()
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
// Expiration will take care of orphans.
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavHistoryObserver, OnClearHistory());
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavHistoryObserver, OnClearHistory());
|
||||
|
||||
// privacy cleanup, if there's an old history.dat around, just delete it
|
||||
nsCOMPtr<nsIFile> oldHistoryFile;
|
||||
@ -5501,13 +5500,14 @@ nsNavHistory::NotifyOnPageExpired(nsIURI *aURI, PRTime aVisitTime,
|
||||
{
|
||||
if (aWholeEntry) {
|
||||
// Notify our observers that the page has been removed.
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavHistoryObserver, OnDeleteURI(aURI));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavHistoryObserver, OnDeleteURI(aURI));
|
||||
}
|
||||
else {
|
||||
// Notify our observers that some visits for the page have been removed.
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavHistoryObserver, OnDeleteVisits(aURI, aVisitTime));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavHistoryObserver,
|
||||
OnDeleteVisits(aURI, aVisitTime));
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
@ -6939,8 +6939,8 @@ void
|
||||
nsNavHistory::SendPageChangedNotification(nsIURI* aURI, PRUint32 aWhat,
|
||||
const nsAString& aValue)
|
||||
{
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavHistoryObserver, OnPageChanged(aURI, aWhat, aValue));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavHistoryObserver,
|
||||
OnPageChanged(aURI, aWhat, aValue));
|
||||
}
|
||||
|
||||
// nsNavHistory::TitleForDomain
|
||||
@ -7072,8 +7072,8 @@ nsNavHistory::SetPageTitleInternal(nsIURI* aURI, const nsAString& aTitle)
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
// observers (have to check first if it's bookmarked)
|
||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||
nsINavHistoryObserver, OnTitleChanged(aURI, aTitle));
|
||||
ENUMERATE_OBSERVERS(mCanNotify, mCacheObservers, mObservers, nsINavHistoryObserver,
|
||||
OnTitleChanged(aURI, aTitle));
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
@ -39,7 +39,7 @@
|
||||
// Call a method on each observer in a category cache, then call the same
|
||||
// method on the observer array.
|
||||
|
||||
#define NOTIFY_OBSERVERS(canFire, cache, array, type, method) \
|
||||
#define ENUMERATE_OBSERVERS(canFire, cache, array, type, method) \
|
||||
PR_BEGIN_MACRO \
|
||||
if (canFire) { \
|
||||
const nsCOMArray<type> &entries = cache.GetEntries(); \
|
||||
|
Loading…
Reference in New Issue
Block a user