Backed out changeset 409b4345b85a (bug 1371679) as requested by Standard8. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 10 Aug 2017 17:48:02 +0200
changeset 373975 5057eb5a60e7f2473af9ddbfafd81b6556d367f6
parent 373974 17a9aa5732e58048b1044b3cc12873859d4df3ce
child 373976 93925b6443b7791d0e3490d523ed1e3f146d3ac4
push id32311
push userkwierso@gmail.com
push dateFri, 11 Aug 2017 01:14:57 +0000
treeherdermozilla-central@253a8560dc34 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1371679
milestone57.0a1
backs out409b4345b85aba3bd93b83c6f9a6a194a2d5073a
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
Backed out changeset 409b4345b85a (bug 1371679) as requested by Standard8. r=backout
toolkit/components/places/nsNavBookmarks.cpp
toolkit/components/places/nsNavHistoryResult.cpp
--- a/toolkit/components/places/nsNavBookmarks.cpp
+++ b/toolkit/components/places/nsNavBookmarks.cpp
@@ -46,17 +46,17 @@ namespace {
 bool DontSkip(nsCOMPtr<nsINavBookmarkObserver> obs) { return false; }
 bool SkipTags(nsCOMPtr<nsINavBookmarkObserver> obs) {
   bool skipTags = false;
   (void) obs->GetSkipTags(&skipTags);
   return skipTags;
 }
 bool SkipDescendants(nsCOMPtr<nsINavBookmarkObserver> obs) {
   bool skipDescendantsOnItemRemoval = false;
-  (void) obs->GetSkipDescendantsOnItemRemoval(&skipDescendantsOnItemRemoval);
+  (void) obs->GetSkipTags(&skipDescendantsOnItemRemoval);
   return skipDescendantsOnItemRemoval;
 }
 
 template<typename Method, typename DataType>
 class AsyncGetBookmarksForURI : public AsyncStatementCallback
 {
 public:
   AsyncGetBookmarksForURI(nsNavBookmarks* aBookmarksSvc,
--- a/toolkit/components/places/nsNavHistoryResult.cpp
+++ b/toolkit/components/places/nsNavHistoryResult.cpp
@@ -4394,17 +4394,17 @@ nsNavHistoryResult::GetSkipTags(bool *aS
 {
   *aSkipTags = false;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsNavHistoryResult::GetSkipDescendantsOnItemRemoval(bool *aSkipDescendantsOnItemRemoval)
 {
-  *aSkipDescendantsOnItemRemoval = true;
+  *aSkipDescendantsOnItemRemoval = false;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsNavHistoryResult::OnBeginUpdateBatch()
 {
   // Since we could be observing both history and bookmarks, it's possible both
   // notify the batch.  We can safely ignore nested calls.