Commit 9028b045 authored by Alexandru Michis's avatar Alexandru Michis
Browse files

Backed out 2 changesets (bug 1707963) for causing bc failures in browser_xpcom_graph_wait.js 

CLOSED TREE

Backed out changeset 4e7eac659186 (bug 1707963)
Backed out changeset 5d86acaf84da (bug 1707963)
parent e21646cb

extensions/permissions/PermissionManager.cpp

+36 −31
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */



#include "mozilla/AbstractThread.h"

#include "mozilla/AppShutdown.h"

#include "mozilla/BasePrincipal.h"

#include "mozilla/ClearOnShutdown.h"

#include "mozilla/ContentPrincipal.h"
@@ -613,6 +612,12 @@ PermissionManager::PermissionKey::CreateFromURI(nsIURI* aURI, 
  return new PermissionKey(origin);

}



/* static */

void PermissionManager::Startup() {

  nsCOMPtr<nsIPermissionManager> permManager =

      do_GetService("@mozilla.org/permissionmanager;1");

}



////////////////////////////////////////////////////////////////////////////////

// PermissionManager Implementation
@@ -623,6 +628,7 @@ PermissionManager::PermissionManager() 
    : mMonitor("PermissionManager::mMonitor"),

      mState(eInitializing),

      mMemoryOnlyDB(false),

      mBlockerAdded(false),

      mLargestID(0) {}



PermissionManager::~PermissionManager() {
@@ -641,14 +647,8 @@ PermissionManager::~PermissionManager() { 
  }

}



/* static */

StaticMutex PermissionManager::sCreationMutex;



// static

already_AddRefed<nsIPermissionManager> PermissionManager::GetXPCOMSingleton() {

  // The lazy initialization could race.

  StaticMutexAutoLock lock(sCreationMutex);



  if (gPermissionManager) {

    return do_AddRef(gPermissionManager);

  }
@@ -670,9 +670,6 @@ already_AddRefed<nsIPermissionManager> PermissionManager::GetXPCOMSingleton() { 


// static

PermissionManager* PermissionManager::GetInstance() {

  // TODO: There is a minimal chance that we can race here with a

  // GetXPCOMSingleton call that did not yet set gPermissionManager.

  // See bug 1745056.

  if (!gPermissionManager) {

    // Hand off the creation of the permission manager to GetXPCOMSingleton.

    nsCOMPtr<nsIPermissionManager> permManager = GetXPCOMSingleton();
@@ -682,12 +679,6 @@ PermissionManager* PermissionManager::GetInstance() { 
}



nsresult PermissionManager::Init() {

  // If we are already shutting down, do not permit a creation.

  // This must match the phase in GetAsyncShutdownClient.

  if (AppShutdown::IsInOrBeyond(ShutdownPhase::XPCOMWillShutdown)) {

    return NS_ERROR_ILLEGAL_DURING_SHUTDOWN;

  }



  // If the 'permissions.memory_only' pref is set to true, then don't write any

  // permission settings to disk, but keep them in a memory-only database.

  mMemoryOnlyDB = Preferences::GetBool("permissions.memory_only", false);
@@ -714,22 +705,31 @@ nsresult PermissionManager::Init() { 


  nsCOMPtr<nsIObserverService> observerService = services::GetObserverService();

  if (observerService) {

    observerService->AddObserver(this, "profile-before-change", true);

    observerService->AddObserver(this, "profile-do-change", true);

    observerService->AddObserver(this, "testonly-reload-permissions-from-disk",

                                 true);

  }



  if (XRE_IsParentProcess()) {

    nsCOMPtr<nsIAsyncShutdownClient> asc = GetAsyncShutdownClient();

    if (!asc) {

      return NS_ERROR_NOT_AVAILABLE;

    }

    nsCOMPtr<nsIAsyncShutdownClient> asc = GetShutdownPhase();

    if (asc) {

      nsAutoString blockerName;

      MOZ_ALWAYS_SUCCEEDS(GetName(blockerName));



    nsresult rv = asc->AddBlocker(

        this, NS_LITERAL_STRING_FROM_CSTRING(__FILE__), __LINE__, blockerName);

    NS_ENSURE_SUCCESS(rv, rv);

      // This method can fail during some xpcshell-tests.

      nsresult rv =

          asc->AddBlocker(this, NS_LITERAL_STRING_FROM_CSTRING(__FILE__),

                          __LINE__, blockerName);

      Unused << NS_WARN_IF(NS_FAILED(rv));

      if (NS_SUCCEEDED(rv)) {

        mBlockerAdded = true;

      }

    }



    if (!mBlockerAdded) {

      ClearOnShutdown(&gPermissionManager);

    }

  }



  AddIdleDailyMaintenanceJob();
@@ -2556,7 +2556,15 @@ NS_IMETHODIMP PermissionManager::Observe(nsISupports* aSubject, 
                                         const char16_t* someData) {

  ENSURE_NOT_CHILD_PROCESS;



  if (!nsCRT::strcmp(aTopic, "profile-do-change")) {

  if (!nsCRT::strcmp(aTopic, "profile-before-change")) {

    if (!mBlockerAdded) {

      // The profile is about to change and the shutdown blocker has not been

      // added yet (we are probably in a xpcshell-test).

      RemoveIdleDailyMaintenanceJob();

      RemoveAllFromMemory();

      CloseDB(eNone);

    }

  } else if (!nsCRT::strcmp(aTopic, "profile-do-change")) {

    // the profile has already changed; init the db from the new location

    InitDB(false);

  } else if (!nsCRT::strcmp(aTopic, "testonly-reload-permissions-from-disk")) {
@@ -3819,7 +3827,7 @@ nsresult PermissionManager::TestPermissionWithoutDefaultsFromPrincipal( 
void PermissionManager::MaybeCompleteShutdown() {

  MOZ_ASSERT(NS_IsMainThread());



  nsCOMPtr<nsIAsyncShutdownClient> asc = GetAsyncShutdownClient();

  nsCOMPtr<nsIAsyncShutdownClient> asc = GetShutdownPhase();

  MOZ_ASSERT(asc);



  DebugOnly<nsresult> rv = asc->RemoveBlocker(this);
@@ -3858,8 +3866,7 @@ PermissionManager::GetState(nsIPropertyBag** aBagOut) { 
  return NS_OK;

}



nsCOMPtr<nsIAsyncShutdownClient> PermissionManager::GetAsyncShutdownClient()

    const {

nsCOMPtr<nsIAsyncShutdownClient> PermissionManager::GetShutdownPhase() const {

  nsresult rv;

  nsCOMPtr<nsIAsyncShutdownService> svc =

      do_GetService("@mozilla.org/async-shutdown-service;1", &rv);
@@ -3868,9 +3875,7 @@ nsCOMPtr<nsIAsyncShutdownClient> PermissionManager::GetAsyncShutdownClient() 
  }



  nsCOMPtr<nsIAsyncShutdownClient> client;

  // This feels very late but there seem to be other services that rely on

  // us later than "profile-before-change".

  rv = svc->GetXpcomWillShutdown(getter_AddRefs(client));

  rv = svc->GetProfileBeforeChange(getter_AddRefs(client));

  MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));



  return client;

extensions/permissions/PermissionManager.h

+12 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include "mozilla/Atomics.h"

#include "mozilla/Monitor.h"

#include "mozilla/MozPromise.h"

#include "mozilla/StaticMutex.h"

#include "mozilla/ThreadBound.h"

#include "mozilla/Variant.h"

#include "mozilla/Vector.h"
@@ -195,6 +194,15 @@ class PermissionManager final : public nsIPermissionManager, 
      nsIURI* aURI, const OriginAttributes* aOriginAttributes,

      const nsACString& aType, uint32_t* aPermission);



  /**

   * Initialize the permission-manager service.

   * The permission manager is always initialized at startup because when it

   * was lazy-initialized on demand, it was possible for it to be created

   * once shutdown had begun, resulting in the manager failing to correctly

   * shutdown because it missed its shutdown observer notification.

   */

  static void Startup();



  nsresult RemovePermissionsWithAttributes(OriginAttributesPattern& aAttrs);



  /**
@@ -365,7 +373,6 @@ class PermissionManager final : public nsIPermissionManager, 


 private:

  ~PermissionManager();

  static StaticMutex sCreationMutex;



  /**

   * Get all permissions for a given principal, which should not be isolated
@@ -522,7 +529,7 @@ class PermissionManager final : public nsIPermissionManager, 
                                      uint32_t aExpireType, int64_t aExpireTime,

                                      int64_t aModificationTime, int64_t aId);



  nsCOMPtr<nsIAsyncShutdownClient> GetAsyncShutdownClient() const;

  nsCOMPtr<nsIAsyncShutdownClient> GetShutdownPhase() const;



  void MaybeCompleteShutdown();
@@ -639,6 +646,8 @@ class PermissionManager final : public nsIPermissionManager, 


  bool mMemoryOnlyDB;



  bool mBlockerAdded;



  nsTHashtable<PermissionHashKey> mPermissionTable;

  // a unique, monotonically increasing id used to identify each database entry

  int64_t mLargestID;

extensions/permissions/test/unit/test_permmanager_migrate_4-7_no_history.js

+0 −5
Original line number Diff line number Diff line
@@ -58,11 +58,6 @@ add_task(function test() { 
    Assert.ok(true, "There wasn't a nsINavHistoryService");

  }



  // We need to execute a pm method to be sure that the DB is fully

  // initialized.

  var pm = Services.perms;

  Assert.ok(pm.all.length >= 0, "Permission manager not initialized?");



  let db = Services.storage.openDatabase(GetPermissionsFile(profile));

  db.schemaVersion = 4;

  db.executeSimpleSQL("DROP TABLE moz_perms");

layout/build/nsLayoutStatics.cpp

+2 −0
Original line number Diff line number Diff line
@@ -243,6 +243,8 @@ nsresult nsLayoutStatics::Initialize() { 


  ProcessPriorityManager::Init();



  PermissionManager::Startup();



  UIDirectionManager::Initialize();



  CacheObserver::Init();

services/common/tests/unit/test_hawkrequest.js

+0 −7
Original line number Diff line number Diff line
@@ -100,13 +100,6 @@ add_task(async function test_hawk_authenticated_request() { 
  let timeOffset = -1 * clockSkew;

  let localTime = then + clockSkew;



  // XXX: This test fails if run with socket process enabled. It passes if

  // we force the permission manager to be initialized, but this might just

  // trigger some side effect and seems not a clean solution so we disabled

  // the entire test, see bug 1743079.

  // var pm = Services.perms;

  // Assert.ok(pm.all.length >= 0, "Permission manager not initialized?");



  // Set the accept-languages pref to the Nepalese dialect of Zulu.

  let acceptLanguage = "zu-NP"; // omit trailing ';', which our HTTP libs snip

  Services.prefs.setStringPref("intl.accept_languages", acceptLanguage);