зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1189369, part 1 - Remove trailing whitespace from some nsNavHistory* files. r=mak
This commit is contained in:
Родитель
767490fbd3
Коммит
f197361a7f
|
@ -509,7 +509,7 @@ protected:
|
|||
*/
|
||||
static void expireNowTimerCallback(nsITimer* aTimer, void* aClosure);
|
||||
|
||||
nsresult ConstructQueryString(const nsCOMArray<nsNavHistoryQuery>& aQueries,
|
||||
nsresult ConstructQueryString(const nsCOMArray<nsNavHistoryQuery>& aQueries,
|
||||
nsNavHistoryQueryOptions* aOptions,
|
||||
nsCString& queryString,
|
||||
bool& aParamsPresent,
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#undef CompareString
|
||||
|
||||
#define TO_ICONTAINER(_node) \
|
||||
static_cast<nsINavHistoryContainerResultNode*>(_node)
|
||||
static_cast<nsINavHistoryContainerResultNode*>(_node)
|
||||
|
||||
#define TO_CONTAINER(_node) \
|
||||
static_cast<nsNavHistoryContainerResultNode*>(_node)
|
||||
|
@ -1108,7 +1108,7 @@ int32_t nsNavHistoryContainerResultNode::SortComparison_AnnotationLess(
|
|||
&b_hasAnno), 0);
|
||||
} else {
|
||||
NS_ENSURE_SUCCESS(annosvc->PageHasAnnotation(b_uri, annoName,
|
||||
&b_hasAnno), 0);
|
||||
&b_hasAnno), 0);
|
||||
}
|
||||
|
||||
int32_t value = 0;
|
||||
|
@ -1374,8 +1374,8 @@ nsNavHistoryContainerResultNode::InsertSortedChild(
|
|||
nsAutoCString sortingAnnotation;
|
||||
GetSortingAnnotation(sortingAnnotation);
|
||||
bool itemExists;
|
||||
uint32_t position = FindInsertionPoint(aNode, comparator,
|
||||
sortingAnnotation.get(),
|
||||
uint32_t position = FindInsertionPoint(aNode, comparator,
|
||||
sortingAnnotation.get(),
|
||||
&itemExists);
|
||||
if (aIgnoreDuplicates && itemExists)
|
||||
return NS_OK;
|
||||
|
@ -1705,7 +1705,7 @@ nsNavHistoryContainerResultNode::FindNodeByDetails(const nsACString& aURIString,
|
|||
aItemId,
|
||||
aRecursive,
|
||||
_retval);
|
||||
|
||||
|
||||
if (NS_SUCCEEDED(rv) && _retval)
|
||||
break;
|
||||
}
|
||||
|
@ -2127,7 +2127,7 @@ nsNavHistoryQueryResultNode::FillChildren()
|
|||
}
|
||||
else if (mOptions->QueryType() != nsINavHistoryQueryOptions::QUERY_TYPE_HISTORY ||
|
||||
sortType != nsINavHistoryQueryOptions::SORT_BY_NONE) {
|
||||
// The default SORT_BY_NONE sorts by the bookmark index (position),
|
||||
// The default SORT_BY_NONE sorts by the bookmark index (position),
|
||||
// which we do not have for history queries.
|
||||
// Once we've computed all tree stats, we can sort, because containers will
|
||||
// then have proper visit counts and dates.
|
||||
|
@ -2233,8 +2233,8 @@ nsNavHistoryQueryResultNode::Refresh()
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
// This is not a root node but it does not have a parent - this means that
|
||||
// the node has already been cleared and it is now called, because it was
|
||||
// This is not a root node but it does not have a parent - this means that
|
||||
// the node has already been cleared and it is now called, because it was
|
||||
// left in a local copy of the observers array.
|
||||
if (mIndentLevel > -1 && !mParent)
|
||||
return NS_OK;
|
||||
|
@ -4278,7 +4278,7 @@ nsNavHistoryResult::AddObserver(nsINavHistoryResultObserver* aObserver,
|
|||
NS_ENSURE_ARG(aObserver);
|
||||
nsresult rv = mObservers.AppendWeakElement(aObserver, aOwnsWeak);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
|
||||
rv = aObserver->SetResult(this);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
|
|
|
@ -175,7 +175,7 @@ public:
|
|||
bool aExpand);
|
||||
|
||||
void InvalidateTree();
|
||||
|
||||
|
||||
bool mBatchInProgress;
|
||||
|
||||
nsMaybeWeakPtrArray<nsINavHistoryResultObserver> mObservers;
|
||||
|
|
Загрузка…
Ссылка в новой задаче