Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-04 15:51:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1627536 - Avoid silly string copying in nsWebBrowserPersit. r=nika

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D69747

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Emilio Cobos Álvarez 2020-04-06 15:37:49 +00:00
parent a9f68d0797
commit e511882ec8
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dom/webbrowserpersist/nsWebBrowserPersist.cpp
View File

@ -1547,7 +1547,7 @@ NS_IMETHODIMP
nsWebBrowserPersist::OnWalk::VisitResource(
nsIWebBrowserPersistDocument* aDoc, const nsACString& aURI,
nsContentPolicyType aContentPolicyType) {
return mParent->StoreURI(nsAutoCString(aURI).get(), aDoc, aContentPolicyType);
return mParent->StoreURI(aURI, aDoc, aContentPolicyType);
}
NS_IMETHODIMP
@ -1557,8 +1557,8 @@ nsWebBrowserPersist::OnWalk::VisitDocument(
nsAutoCString uriSpec;
nsresult rv = aSubDoc->GetDocumentURI(uriSpec);
NS_ENSURE_SUCCESS(rv, rv);
rv = mParent->StoreURI(uriSpec.get(), aDoc,
nsIContentPolicy::TYPE_SUBDOCUMENT, false, &data);
rv = mParent->StoreURI(uriSpec, aDoc, nsIContentPolicy::TYPE_SUBDOCUMENT,
false, &data);
NS_ENSURE_SUCCESS(rv, rv);
if (!data) {
// If the URI scheme isn't persistable, then don't persist.
@ -2217,15 +2217,13 @@ void nsWebBrowserPersist::CalcTotalProgress() {
}
}
nsresult nsWebBrowserPersist::StoreURI(const char* aURI,
nsresult nsWebBrowserPersist::StoreURI(const nsACString& aURI,
nsIWebBrowserPersistDocument* aDoc,
nsContentPolicyType aContentPolicyType,
bool aNeedsPersisting, URIData** aData) {
NS_ENSURE_ARG_POINTER(aURI);
nsCOMPtr<nsIURI> uri;
nsresult rv = NS_NewURI(getter_AddRefs(uri), nsDependentCString(aURI),
mCurrentCharset.get(), mCurrentBaseURI);
nsresult rv = NS_NewURI(getter_AddRefs(uri), aURI, mCurrentCharset.get(),
mCurrentBaseURI);
NS_ENSURE_SUCCESS(rv, rv);
return StoreURI(uri, aDoc, aContentPolicyType, aNeedsPersisting, aData);
@ -2419,7 +2417,7 @@ nsresult nsWebBrowserPersist::SaveSubframeContent(
StringBeginsWith(contentType, NS_LITERAL_CSTRING("video/"))) {
policyType = nsIContentPolicy::TYPE_MEDIA;
}
rv = StoreURI(aURISpec.get(), aParentDocument, policyType);
rv = StoreURI(aURISpec, aParentDocument, policyType);
}
NS_ENSURE_SUCCESS(rv, rv);

2
dom/webbrowserpersist/nsWebBrowserPersist.h
View File

@ -104,7 +104,7 @@ class nsWebBrowserPersist final : public nsIInterfaceRequestor,
nsCOMPtr<nsIURI>& aOutURI);
nsresult CalculateUniqueFilename(nsIURI* aURI, nsCOMPtr<nsIURI>& aOutURI);
nsresult MakeFilenameFromURI(nsIURI* aURI, nsString& aFilename);
nsresult StoreURI(const char* aURI, nsIWebBrowserPersistDocument* aDoc,
nsresult StoreURI(const nsACString& aURI, nsIWebBrowserPersistDocument* aDoc,
nsContentPolicyType aContentPolicyType,
bool aNeedsPersisting = true, URIData** aData = nullptr);
nsresult StoreURI(nsIURI* aURI, nsIWebBrowserPersistDocument* aDoc,