Bug 1378218, back out the wrong patch, r=me
authorOlli Pettay <Olli.Pettay@helsinki.fi>
Thu, 06 Jul 2017 22:41:22 +0300
changeset 367637 35bdc75bcca90ac8ad0fadcdc32fe6cfa2227006
parent 367636 47021e6deb24d25f43bded547c2c896de958f4b5
child 367638 c0b7b3cc327a8ed77ca1a635debc89a26eeca470
push id92293
push useropettay@mozilla.com
push dateThu, 06 Jul 2017 19:41:42 +0000
treeherdermozilla-inbound@35bdc75bcca9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1378218
milestone56.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 1378218, back out the wrong patch, r=me
dom/base/Link.cpp
dom/base/Link.h
storage/mozStorageService.cpp
--- a/dom/base/Link.cpp
+++ b/dom/base/Link.cpp
@@ -192,18 +192,17 @@ Link::LinkState() const
   // We are a constant method, but we are just lazily doing things and have to
   // track that state.  Cast away that constness!
   Link *self = const_cast<Link *>(this);
 
   Element *element = self->mElement;
 
   // If we have not yet registered for notifications and need to,
   // due to our href changing, register now!
-  if (!mRegistered && mNeedsRegistration && element->IsInComposedDoc() &&
-      !HasPendingLinkUpdate()) {
+  if (!mRegistered && mNeedsRegistration && element->IsInComposedDoc()) {
     // Only try and register once.
     self->mNeedsRegistration = false;
 
     nsCOMPtr<nsIURI> hrefURI(GetURI());
 
     // Assume that we are not visited until we are told otherwise.
     self->mLinkState = eLinkState_Unvisited;
 
--- a/dom/base/Link.h
+++ b/dom/base/Link.h
@@ -121,17 +121,17 @@ public:
   void TryDNSPrefetch();
   void CancelDNSPrefetch(nsWrapperCache::FlagsType aDeferredFlag,
                          nsWrapperCache::FlagsType aRequestedFlag);
 
   // This is called by HTMLLinkElement.
   void TryDNSPrefetchPreconnectOrPrefetchOrPrerender();
   void CancelPrefetch();
 
-  bool HasPendingLinkUpdate() const { return mHasPendingLinkUpdate; }
+  bool HasPendingLinkUpdate() { return mHasPendingLinkUpdate; }
   void SetHasPendingLinkUpdate() { mHasPendingLinkUpdate = true; }
   void ClearHasPendingLinkUpdate() { mHasPendingLinkUpdate = false; }
 
   // To ensure correct mHasPendingLinkUpdate handling, we have this method
   // similar to the one in Element. Overriders must call
   // ClearHasPendingLinkUpdate().
   // If you change this, change also the method in Element.
   virtual void NodeInfoChanged(nsIDocument* aOldDoc) = 0;
--- a/storage/mozStorageService.cpp
+++ b/storage/mozStorageService.cpp
@@ -283,16 +283,19 @@ Service::~Service()
     NS_WARNING("Failed to unregister sqlite vfs wrapper.");
 
   // Shutdown the sqlite3 API.  Warn if shutdown did not turn out okay, but
   // there is nothing actionable we can do in that case.
   rc = ::sqlite3_shutdown();
   if (rc != SQLITE_OK)
     NS_WARNING("sqlite3 did not shutdown cleanly.");
 
+  DebugOnly<bool> shutdownObserved = !sXPConnect;
+  NS_ASSERTION(shutdownObserved, "Shutdown was not observed!");
+
   gService = nullptr;
   delete mSqliteVFS;
   mSqliteVFS = nullptr;
 }
 
 void
 Service::registerConnection(Connection *aConnection)
 {