mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-21 17:25:36 +00:00
ace6d1063f
The inclusions were removed with the following very crude script and the resulting breakage was fixed up by hand. The manual fixups did either revert the changes done by the script, replace a generic header with a more specific one or replace a header with a forward declaration. find . -name "*.idl" | grep -v web-platform | grep -v third_party | while read path; do interfaces=$(grep "^\(class\|interface\).*:.*" "$path" | cut -d' ' -f2) if [ -n "$interfaces" ]; then if [[ "$interfaces" == *$'\n'* ]]; then regexp="\(" for i in $interfaces; do regexp="$regexp$i\|"; done regexp="${regexp%%\\\|}\)" else regexp="$interfaces" fi interface=$(basename "$path") rg -l "#include.*${interface%%.idl}.h" . | while read path2; do hits=$(grep -v "#include.*${interface%%.idl}.h" "$path2" | grep -c "$regexp" ) if [ $hits -eq 0 ]; then echo "Removing ${interface} from ${path2}" grep -v "#include.*${interface%%.idl}.h" "$path2" > "$path2".tmp mv -f "$path2".tmp "$path2" fi done fi done Differential Revision: https://phabricator.services.mozilla.com/D55442 --HG-- extra : moz-landing-system : lando
85 lines
2.7 KiB
C++
85 lines
2.7 KiB
C++
/* -*- Mode: C++; tab-width: 4; 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 "txURIUtils.h"
|
|
#include "nsNetUtil.h"
|
|
#include "mozilla/dom/Document.h"
|
|
#include "nsIPrincipal.h"
|
|
#include "mozilla/LoadInfo.h"
|
|
#include "mozilla/dom/nsCSPContext.h"
|
|
|
|
using mozilla::dom::Document;
|
|
using mozilla::net::LoadInfo;
|
|
|
|
/**
|
|
* URIUtils
|
|
* A set of utilities for handling URIs
|
|
**/
|
|
|
|
/**
|
|
* Resolves the given href argument, using the given documentBase
|
|
* if necessary.
|
|
* The new resolved href will be appended to the given dest String
|
|
**/
|
|
void URIUtils::resolveHref(const nsAString& href, const nsAString& base,
|
|
nsAString& dest) {
|
|
if (base.IsEmpty()) {
|
|
dest.Append(href);
|
|
return;
|
|
}
|
|
if (href.IsEmpty()) {
|
|
dest.Append(base);
|
|
return;
|
|
}
|
|
nsCOMPtr<nsIURI> pURL;
|
|
nsAutoString resultHref;
|
|
nsresult result = NS_NewURI(getter_AddRefs(pURL), base);
|
|
if (NS_SUCCEEDED(result)) {
|
|
NS_MakeAbsoluteURI(resultHref, href, pURL);
|
|
dest.Append(resultHref);
|
|
}
|
|
} //-- resolveHref
|
|
|
|
// static
|
|
void URIUtils::ResetWithSource(Document* aNewDoc, nsINode* aSourceNode) {
|
|
nsCOMPtr<Document> sourceDoc = aSourceNode->OwnerDoc();
|
|
nsIPrincipal* sourcePrincipal = sourceDoc->NodePrincipal();
|
|
nsIPrincipal* sourceStoragePrincipal = sourceDoc->EffectiveStoragePrincipal();
|
|
|
|
// Copy the channel and loadgroup from the source document.
|
|
nsCOMPtr<nsILoadGroup> loadGroup = sourceDoc->GetDocumentLoadGroup();
|
|
nsCOMPtr<nsIChannel> channel = sourceDoc->GetChannel();
|
|
if (!channel) {
|
|
// Need to synthesize one
|
|
nsresult rv = NS_NewChannel(
|
|
getter_AddRefs(channel), sourceDoc->GetDocumentURI(), sourceDoc,
|
|
nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL, nsIContentPolicy::TYPE_OTHER,
|
|
nullptr, // aPerformanceStorage
|
|
loadGroup,
|
|
nullptr, // aCallbacks
|
|
nsIChannel::LOAD_BYPASS_SERVICE_WORKER);
|
|
|
|
if (NS_FAILED(rv)) {
|
|
return;
|
|
}
|
|
}
|
|
|
|
aNewDoc->Reset(channel, loadGroup);
|
|
aNewDoc->SetPrincipals(sourcePrincipal, sourceStoragePrincipal);
|
|
aNewDoc->SetBaseURI(sourceDoc->GetDocBaseURI());
|
|
|
|
// Inherit the csp if there is one
|
|
nsCOMPtr<nsIContentSecurityPolicy> csp = sourceDoc->GetCsp();
|
|
if (csp) {
|
|
RefPtr<nsCSPContext> cspToInherit = new nsCSPContext();
|
|
cspToInherit->InitFromOther(static_cast<nsCSPContext*>(csp.get()));
|
|
aNewDoc->SetCsp(cspToInherit);
|
|
}
|
|
// Copy charset
|
|
aNewDoc->SetDocumentCharacterSetSource(
|
|
sourceDoc->GetDocumentCharacterSetSource());
|
|
aNewDoc->SetDocumentCharacterSet(sourceDoc->GetDocumentCharacterSet());
|
|
}
|