author | Bill McCloskey <billm@mozilla.com> |
Wed, 03 Jun 2015 11:52:47 -0700 | |
changeset 247884 | 1f7eb3853f3cd399d7f87c9bd833d9fb6f792d15 |
parent 247883 | fd26eba375aeacbc8fa2612282cf68175857b8aa |
child 247885 | 4c9a2ddee434093f154768c9ad1f70a5718fa989 |
push id | 28885 |
push user | cbook@mozilla.com |
push date | Wed, 10 Jun 2015 13:18:59 +0000 |
treeherder | autoland@e101c589c242 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ckerschb |
bugs | 1171234 |
milestone | 41.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
|
--- a/uriloader/prefetch/nsPrefetchService.cpp +++ b/uriloader/prefetch/nsPrefetchService.cpp @@ -1,8 +1,9 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsPrefetchService.h" #include "nsICacheEntry.h" #include "nsIServiceManager.h" #include "nsICategoryManager.h" @@ -180,25 +181,27 @@ nsPrefetchNode::OpenChannel() { nsCOMPtr<nsINode> source = do_QueryReferent(mSource); if (!source) { // Don't attempt to prefetch if we don't have a source node // (which should never happen). return NS_ERROR_FAILURE; } nsCOMPtr<nsILoadGroup> loadGroup = source->OwnerDoc()->GetDocumentLoadGroup(); - nsresult rv = NS_NewChannel(getter_AddRefs(mChannel), - mURI, - nsContentUtils::GetSystemPrincipal(), - nsILoadInfo::SEC_NORMAL, - nsIContentPolicy::TYPE_OTHER, - loadGroup, // aLoadGroup - this, // aCallbacks - nsIRequest::LOAD_BACKGROUND | - nsICachingChannel::LOAD_ONLY_IF_MODIFIED); + nsresult rv = NS_NewChannelInternal(getter_AddRefs(mChannel), + mURI, + source, + source->NodePrincipal(), + nullptr, //aTriggeringPrincipal + nsILoadInfo::SEC_NORMAL, + nsIContentPolicy::TYPE_OTHER, + loadGroup, // aLoadGroup + this, // aCallbacks + nsIRequest::LOAD_BACKGROUND | + nsICachingChannel::LOAD_ONLY_IF_MODIFIED); NS_ENSURE_SUCCESS(rv, rv); // configure HTTP specific stuff nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(mChannel); if (httpChannel) { httpChannel->SetReferrer(mReferrerURI);