Backed out changeset aba9324719be (bug 863246)

This commit is contained in:
Sebastian Hengst 2017-08-25 16:43:39 +02:00
Родитель a8f25b8f67
Коммит e6e16e5e43
1 изменённых файлов: 1 добавлений и 10 удалений

Просмотреть файл

@ -894,19 +894,10 @@ private:
{
AssertIsOnMainThread();
MOZ_ASSERT(aIndex < mLoadInfos.Length());
MOZ_ASSERT_IF(IsMainWorkerScript(), mWorkerScriptType != DebuggerScript);
WorkerPrivate* parentWorker = mWorkerPrivate->GetParent();
// For JavaScript debugging, the devtools server must run on the same
// thread as the debuggee, indicating the worker uses content principal.
// However, in Bug 863246, web content will no longer be able to load
// resource:// URIs by default, so we need system principal to load
// debugger scripts.
nsIPrincipal* principal = (mWorkerScriptType == DebuggerScript) ?
nsContentUtils::GetSystemPrincipal() :
mWorkerPrivate->GetPrincipal();
nsIPrincipal* principal = mWorkerPrivate->GetPrincipal();
nsCOMPtr<nsILoadGroup> loadGroup = mWorkerPrivate->GetLoadGroup();
MOZ_DIAGNOSTIC_ASSERT(principal);