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