Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1368754 - Change NodeHistoryDetailsChanged and NodeURIChanged to be called with old time,access count and uri, r=mak

Browse Source 
Update interface and all instances where the method is called
to be called with the old values, since the new values are already
there as a part of the node, and thus redundant.

MozReview-Commit-ID: 5pcfJbg9tej

--HG--
extra : rebase_source : 4053523f466c3b1f77148376e1e93aa4bcb7e417
This commit is contained in:
milindl 2017-05-30 23:46:59 +05:30
parent 786b52b5e9
commit 4371c9b5b8
3 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
toolkit/components/places/nsINavHistoryService.idl
View File

@ -376,10 +376,10 @@ interface nsINavHistoryResultObserver : nsISupports
* @param aNode
* a result node
* @param aNewURI
* the new uri
* the old uri
*/
void nodeURIChanged(in nsINavHistoryResultNode aNode,
in AUTF8String aNewURI);
in AUTF8String aOldURI);
/**
* Called right after aNode's icon property has changed.
@ -397,14 +397,14 @@ interface nsINavHistoryResultObserver : nsISupports
*
* @param aNode
* a uri result node
* @param aNewVisitDate
* the new visit date
* @param aNewAccessCount
* the new access-count
* @param aOldVisitDate
* the old visit date
* @param aOldAccessCount
* the old access-count
*/
void nodeHistoryDetailsChanged(in nsINavHistoryResultNode aNode,
in PRTime aNewVisitDate,
in unsigned long aNewAccessCount);
in PRTime aOldVisitDate,
in unsigned long aOldAccessCount);
/**
* Called when the tags set on the uri represented by aNode have changed.

4
toolkit/components/places/nsLivemarkService.js
View File

@ -663,8 +663,10 @@ Livemark.prototype = {
* Whether the nodes should be set as visited.
*/
updateURIVisitedStatus(aURI, aVisitedStatus) {
let wasVisited = false;
for (let child of this.children) {
if (!aURI || child.uri.equals(aURI)) {
wasVisited = child.visited;
child.visited = aVisitedStatus;
}
}
@ -675,7 +677,7 @@ Livemark.prototype = {
for (let node of nodes) {
if (!aURI || node.uri == aURI.spec) {
Services.tm.dispatchToMainThread(() => {
observer.nodeHistoryDetailsChanged(node, 0, aVisitedStatus);
observer.nodeHistoryDetailsChanged(node, node.time, wasVisited);
});
}
}

31
toolkit/components/places/nsNavHistoryResult.cpp
View File

@ -658,6 +658,9 @@ nsNavHistoryContainerResultNode::ReverseUpdateStats(int32_t aAccessCountChange)
bool shouldNotify = result && mParent->mParent &&
mParent->mParent->AreChildrenVisible();
uint32_t oldAccessCount = mParent->mAccessCount;
PRTime oldTime = mParent->mTime;
mParent->mAccessCount += aAccessCountChange;
bool timeChanged = false;
if (mTime > mParent->mTime) {
@ -668,8 +671,8 @@ nsNavHistoryContainerResultNode::ReverseUpdateStats(int32_t aAccessCountChange)
if (shouldNotify) {
NOTIFY_RESULT_OBSERVERS(result,
NodeHistoryDetailsChanged(TO_ICONTAINER(mParent),
mParent->mTime,
mParent->mAccessCount));
oldTime,
oldAccessCount));
}
// check sorting, the stats may have caused this node to move if the
@ -1341,14 +1344,17 @@ nsNavHistoryContainerResultNode::InsertChildAt(nsNavHistoryResultNode* aNode,
return NS_ERROR_OUT_OF_MEMORY;
// Update our stats and notify the result's observers.
uint32_t oldAccessCount = mAccessCount;
PRTime oldTime = mTime;
mAccessCount += aNode->mAccessCount;
if (mTime < aNode->mTime)
mTime = aNode->mTime;
if (!mParent || mParent->AreChildrenVisible()) {
NOTIFY_RESULT_OBSERVERS(result,
NodeHistoryDetailsChanged(TO_ICONTAINER(this),
mTime,
mAccessCount));
oldTime,
oldAccessCount));
}
nsresult rv = ReverseUpdateStats(aNode->mAccessCount);
@ -1567,6 +1573,9 @@ nsNavHistoryContainerResultNode::UpdateURIs(bool aRecursive, bool aOnlyOne,
uint32_t oldAccessCount = node->mAccessCount;
PRTime oldTime = node->mTime;
uint32_t parentOldAccessCount = parent->mAccessCount;
PRTime parentOldTime = parent->mTime;
aCallback(node, aClosure, result);
if (oldAccessCount != node->mAccessCount || oldTime != node->mTime) {
@ -1577,8 +1586,8 @@ nsNavHistoryContainerResultNode::UpdateURIs(bool aRecursive, bool aOnlyOne,
NOTIFY_RESULT_OBSERVERS_RET(result,
NodeHistoryDetailsChanged(
TO_ICONTAINER(parent),
parent->mTime,
parent->mAccessCount),
parentOldTime,
parentOldAccessCount),
true);
}
DebugOnly<nsresult> rv = parent->ReverseUpdateStats(node->mAccessCount - oldAccessCount);
@ -3751,19 +3760,21 @@ nsNavHistoryResultNode::OnItemChanged(int64_t aItemId,
else if (aProperty.EqualsLiteral("uri")) {
// clear the tags string as well
mTags.SetIsVoid(true);
nsCString oldURI(mURI);
mURI = aNewValue;
if (shouldNotify)
NOTIFY_RESULT_OBSERVERS(result, NodeURIChanged(this, mURI));
NOTIFY_RESULT_OBSERVERS(result, NodeURIChanged(this, oldURI));
}
else if (aProperty.EqualsLiteral("favicon")) {
if (shouldNotify)
NOTIFY_RESULT_OBSERVERS(result, NodeIconChanged(this));
}
else if (aProperty.EqualsLiteral("cleartime")) {
PRTime oldTime = mTime;
mTime = 0;
if (shouldNotify) {
NOTIFY_RESULT_OBSERVERS(result,
NodeHistoryDetailsChanged(this, 0, mAccessCount));
NodeHistoryDetailsChanged(this, oldTime, mAccessCount));
}
}
else if (aProperty.EqualsLiteral("tags")) {
@ -3858,6 +3869,8 @@ nsNavHistoryFolderResultNode::OnItemVisited(int64_t aItemId,
return NS_ERROR_FAILURE;
// Update node.
uint32_t nodeOldAccessCount = node->mAccessCount;
PRTime nodeOldTime = node->mTime;
node->mTime = aTime;
++node->mAccessCount;
@ -3885,7 +3898,7 @@ nsNavHistoryFolderResultNode::OnItemVisited(int64_t aItemId,
// Sorting has not changed, just redraw the row if it's visible.
nsNavHistoryResult* result = GetResult();
NOTIFY_RESULT_OBSERVERS(result,
NodeHistoryDetailsChanged(node, mTime, mAccessCount));
NodeHistoryDetailsChanged(node, nodeOldTime, nodeOldAccessCount));
}
// Update sorting if necessary.