Bug 1189369, part 1 - Remove trailing whitespace from some nsNavHistory* files. r=mak
authorAndrew McCreight <continuation@gmail.com>
Tue, 04 Aug 2015 13:55:01 -0700
changeset 287854 ab292e72b0f3fe5cfa88b510116f58cc690d95ad
parent 287853 7ffb30e0ec45dcebebdb324640685060c9035bae
child 287855 25131573fd45d83e1d462ff78d2d5d28a2e5a464
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak
bugs1189369
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1189369, part 1 - Remove trailing whitespace from some nsNavHistory* files. r=mak
toolkit/components/places/nsNavHistory.h
toolkit/components/places/nsNavHistoryResult.cpp
toolkit/components/places/nsNavHistoryResult.h
--- a/toolkit/components/places/nsNavHistory.h
+++ b/toolkit/components/places/nsNavHistory.h
@@ -504,17 +504,17 @@ protected:
   PRTime GetNow();
   PRTime mCachedNow;
   nsCOMPtr<nsITimer> mExpireNowTimer;
   /**
    * Called when the cached now value is expired and needs renewal.
    */
   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,
                                 StringHash& aAddParams);
 
   nsresult QueryToSelectClause(nsNavHistoryQuery* aQuery,
                                nsNavHistoryQueryOptions* aOptions,
                                int32_t aQueryIndex,
--- a/toolkit/components/places/nsNavHistoryResult.cpp
+++ b/toolkit/components/places/nsNavHistoryResult.cpp
@@ -21,17 +21,17 @@
 #include "nsQueryObject.h"
 
 #include "nsCycleCollectionParticipant.h"
 
 // Thanks, Windows.h :(
 #undef CompareString
 
 #define TO_ICONTAINER(_node)                                                  \
-    static_cast<nsINavHistoryContainerResultNode*>(_node)                      
+    static_cast<nsINavHistoryContainerResultNode*>(_node)
 
 #define TO_CONTAINER(_node)                                                   \
     static_cast<nsNavHistoryContainerResultNode*>(_node)
 
 #define NOTIFY_RESULT_OBSERVERS_RET(_result, _method, _ret)                   \
   PR_BEGIN_MACRO                                                              \
   NS_ENSURE_TRUE(_result, _ret);                                              \
   if (!_result->mSuppressNotifications) {                                     \
@@ -1103,17 +1103,17 @@ int32_t nsNavHistoryContainerResultNode:
     NS_ENSURE_SUCCESS(annosvc->PageHasAnnotation(a_uri, annoName,
                                                  &a_hasAnno), 0);
   }
   if (b_itemAnno) {
     NS_ENSURE_SUCCESS(annosvc->ItemHasAnnotation(b->mItemId, annoName,
                                                  &b_hasAnno), 0);
   } else {
     NS_ENSURE_SUCCESS(annosvc->PageHasAnnotation(b_uri, annoName,
-                                                 &b_hasAnno), 0);    
+                                                 &b_hasAnno), 0);
   }
 
   int32_t value = 0;
   if (a_hasAnno || b_hasAnno) {
     uint16_t annoType;
     if (a_hasAnno) {
       if (a_itemAnno) {
         NS_ENSURE_SUCCESS(annosvc->GetItemAnnotationType(a->mItemId,
@@ -1369,18 +1369,18 @@ nsNavHistoryContainerResultNode::InsertS
       nsNavHistoryContainerResultNode* container = aNode->GetAsContainer();
       container->mResult = mResult;
       container->FillStats();
     }
 
     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;
 
     return InsertChildAt(aNode, position);
   }
   return InsertChildAt(aNode, mChildren.Count());
 }
@@ -1700,17 +1700,17 @@ nsNavHistoryContainerResultNode::FindNod
     if (aRecursive && mChildren[i]->IsContainer()) {
       nsNavHistoryContainerResultNode* asContainer =
         mChildren[i]->GetAsContainer();
       if (asContainer->mExpanded) {
         nsresult rv = asContainer->FindNodeByDetails(aURIString, aTime,
                                                      aItemId,
                                                      aRecursive,
                                                      _retval);
-                                                      
+
         if (NS_SUCCEEDED(rv) && _retval)
           break;
       }
     }
   }
   NS_IF_ADDREF(*_retval);
   return NS_OK;
 }
@@ -2122,17 +2122,17 @@ nsNavHistoryQueryResultNode::FillChildre
 
   if (mResult && mResult->mNeedsToApplySortingMode) {
     // We should repopulate container and then apply sortingMode.  To avoid
     // sorting 2 times we simply do that here.
     mResult->SetSortingMode(mResult->mSortingMode);
   }
   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.
     SortComparator comparator = GetSortingComparator(GetSortType());
     if (comparator) {
       nsAutoCString sortingAnnotation;
       GetSortingAnnotation(sortingAnnotation);
       // Usually containers queries results comes already sorted from the
@@ -2228,18 +2228,18 @@ nsNavHistoryQueryResultNode::Refresh()
 {
   nsNavHistoryResult* result = GetResult();
   NS_ENSURE_STATE(result);
   if (result->mBatchInProgress) {
     result->requestRefresh(this);
     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;
 
   // Do not refresh if we are not expanded or if we are child of a query
   // containing other queries.  In this case calling Refresh for each child
   // query could cause a major slowdown.  We should not refresh nested
   // queries, since we will already refresh the parent one.
@@ -4273,17 +4273,17 @@ nsNavHistoryResult::SetSortingAnnotation
 
 NS_IMETHODIMP
 nsNavHistoryResult::AddObserver(nsINavHistoryResultObserver* aObserver,
                                 bool aOwnsWeak)
 {
   NS_ENSURE_ARG(aObserver);
   nsresult rv = mObservers.AppendWeakElement(aObserver, aOwnsWeak);
   NS_ENSURE_SUCCESS(rv, rv);
-  
+
   rv = aObserver->SetResult(this);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // If we are batching, notify a fake batch start to the observers.
   // Not doing so would then notify a not coupled batch end.
   if (mBatchInProgress) {
     NOTIFY_RESULT_OBSERVERS(this, Batching(true));
   }
--- a/toolkit/components/places/nsNavHistoryResult.h
+++ b/toolkit/components/places/nsNavHistoryResult.h
@@ -170,17 +170,17 @@ public:
   FolderObserverList* BookmarkFolderObserversForId(int64_t aFolderId, bool aCreate);
 
   typedef nsTArray< nsRefPtr<nsNavHistoryContainerResultNode> > ContainerObserverList;
 
   void RecursiveExpandCollapse(nsNavHistoryContainerResultNode* aContainer,
                                bool aExpand);
 
   void InvalidateTree();
-  
+
   bool mBatchInProgress;
 
   nsMaybeWeakPtrArray<nsINavHistoryResultObserver> mObservers;
   bool mSuppressNotifications;
 
   ContainerObserverList mRefreshParticipants;
   void requestRefresh(nsNavHistoryContainerResultNode* aContainer);