From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:33 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- netwerk/base/nsNetUtil.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'netwerk/base/nsNetUtil.cpp') diff --git a/netwerk/base/nsNetUtil.cpp b/netwerk/base/nsNetUtil.cpp index 4c03cf63c3..ac86d8fa32 100644 --- a/netwerk/base/nsNetUtil.cpp +++ b/netwerk/base/nsNetUtil.cpp @@ -96,7 +96,9 @@ #include "nsSocketTransportService2.h" #include "nsViewSourceHandler.h" #include "nsJARURI.h" -#include "nsIconURI.h" +#ifndef XP_IOS +# include "nsIconURI.h" +#endif #include "nsAboutProtocolHandler.h" #include "nsResProtocolHandler.h" #include "mozilla/net/ExtensionProtocolHandler.h" @@ -1951,11 +1953,13 @@ nsresult NS_NewURI(nsIURI** aURI, const nsACString& aSpec, .Finalize(aURI); } +#ifndef XP_IOS if (scheme.EqualsLiteral("moz-icon")) { return NS_MutateURI(new nsMozIconURI::Mutator()) .SetSpec(aSpec) .Finalize(aURI); } +#endif #ifdef MOZ_WIDGET_GTK if (scheme.EqualsLiteral("smb") || scheme.EqualsLiteral("sftp")) { -- cgit v1.2.3