Bug 894215 part 1. Change nsSHEntryShared to inherit from nsStubMutationObserver. r=smaug

docshell/shistory/nsSHEntryShared.cpp

@@ -246,18 +246,6 @@ nsSHEntryShared::GetID(uint64_t* aID)
   return NS_OK;
 }
 
-void
-nsSHEntryShared::NodeWillBeDestroyed(const nsINode* aNode)
-{
-  NS_NOTREACHED("Document destroyed while we're holding a strong ref to it");
-}
-
-void
-nsSHEntryShared::CharacterDataWillChange(nsIContent* aContent,
-                                         const CharacterDataChangeInfo&)
-{
-}
-
 void
 nsSHEntryShared::CharacterDataChanged(nsIContent* aContent,
                                       const CharacterDataChangeInfo&)
@@ -265,21 +253,6 @@ nsSHEntryShared::CharacterDataChanged(nsIContent* aContent,
   RemoveFromBFCacheAsync();
 }
 
-void
-nsSHEntryShared::AttributeWillChange(dom::Element* aContent,
-                                     int32_t aNameSpaceID,
-                                     nsAtom* aAttribute,
-                                     int32_t aModType,
-                                     const nsAttrValue* aNewValue)
-{
-}
-
-void
-nsSHEntryShared::NativeAnonymousChildListChange(nsIContent* aContent,
-                                                bool aIsRemove)
-{
-}
-
 void
 nsSHEntryShared::AttributeChanged(dom::Element* aElement,
                                   int32_t aNameSpaceID,
@@ -308,8 +281,3 @@ nsSHEntryShared::ContentRemoved(nsIContent* aChild,
 {
   RemoveFromBFCacheAsync();
 }
-
-void
-nsSHEntryShared::ParentChainChanged(nsIContent* aContent)
-{
-}

docshell/shistory/nsSHEntryShared.h

@@ -12,9 +12,9 @@
 #include "nsCOMPtr.h"
 #include "nsExpirationTracker.h"
 #include "nsIBFCacheEntry.h"
-#include "nsIMutationObserver.h"
 #include "nsRect.h"
 #include "nsString.h"
+#include "nsStubMutationObserver.h"
 #include "nsWeakPtr.h"
 
 #include "mozilla/Attributes.h"
@@ -36,7 +36,7 @@ class nsIMutableArray;
 // nsSHEntryShared is the vehicle for this sharing.
 class nsSHEntryShared final
   : public nsIBFCacheEntry
-  , public nsIMutationObserver
+  , public nsStubMutationObserver
 {
 public:
   static void EnsureHistoryTracker();
@@ -45,9 +45,15 @@ public:
   nsSHEntryShared();
 
   NS_DECL_ISUPPORTS
-  NS_DECL_NSIMUTATIONOBSERVER
   NS_DECL_NSIBFCACHEENTRY
 
+  // The nsIMutationObserver bits we actually care about.
+  NS_DECL_NSIMUTATIONOBSERVER_CHARACTERDATACHANGED
+  NS_DECL_NSIMUTATIONOBSERVER_ATTRIBUTECHANGED
+  NS_DECL_NSIMUTATIONOBSERVER_CONTENTAPPENDED
+  NS_DECL_NSIMUTATIONOBSERVER_CONTENTINSERTED
+  NS_DECL_NSIMUTATIONOBSERVER_CONTENTREMOVED
+
   nsExpirationState *GetExpirationState() { return &mExpirationState; }
 
 private: