ma1 pushed to branch tor-browser-115.26.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 5bf7864a by hackademix at 2025-07-22T10:06:41+02:00 Revert "Bug 1972282 - Check for spoof English in xsl:sort. r=smaug" This reverts commit c3a28639e4571b83271bffed6911d3c959bc2948: no JSLocale in mozilla::RFPTarget / GetSpoofedJSLocale in mozilla::nsRFPService - - - - - 50260f8e by hackademix at 2025-07-22T10:06:43+02:00 fixup! Bug 1970658 - Apply YouTube embed URL replacement to the path component. a=dmeehan Fix esr115 code mismatch. - - - - - 3 changed files: - dom/base/nsObjectLoadingContent.cpp - dom/xslt/xpath/txXPathNode.h - dom/xslt/xslt/txNodeSorter.cpp Changes: ===================================== dom/base/nsObjectLoadingContent.cpp ===================================== @@ -791,8 +791,8 @@ void nsObjectLoadingContent::MaybeRewriteYoutubeEmbed(nsIURI* aURI, path.ReplaceSubstring("/v/"_ns, "/embed/"_ns); NS_ConvertUTF8toUTF16 utf16URI(prePath); AppendUTF8toUTF16(path, utf16URI); - rv = nsContentUtils::NewURIWithDocumentCharset(aRewrittenURI, utf16URI, doc, - aBaseURI); + rv = nsContentUtils::NewURIWithDocumentCharset( + aRewrittenURI, utf16URI, thisContent->OwnerDoc(), aBaseURI); if (NS_FAILED(rv)) { return; } ===================================== dom/xslt/xpath/txXPathNode.h ===================================== @@ -66,8 +66,6 @@ class txXPathNode { bool operator!=(const txXPathNode& aNode) const { return !(*this == aNode); } ~txXPathNode() { MOZ_COUNT_DTOR(txXPathNode); } - mozilla::dom::Document* OwnerDoc() const { return mNode->OwnerDoc(); } - private: friend class txXPathNativeNode; friend class txXPathNodeUtils; ===================================== dom/xslt/xslt/txNodeSorter.cpp ===================================== @@ -14,13 +14,10 @@ #include "mozilla/CheckedInt.h" #include "mozilla/UniquePtrExtensions.h" -#include "nsRFPService.h" using mozilla::CheckedUint32; using mozilla::MakeUnique; using mozilla::MakeUniqueFallible; -using mozilla::nsRFPService; -using mozilla::RFPTarget; using mozilla::UniquePtr; /* @@ -78,10 +75,6 @@ nsresult txNodeSorter::addSortElement(Expr* aSelectExpr, Expr* aLangExpr, if (aLangExpr) { rv = aLangExpr->evaluateToString(aContext, lang); NS_ENSURE_SUCCESS(rv, rv); - } else if (aContext->getContextNode() - .OwnerDoc() - ->ShouldResistFingerprinting(RFPTarget::JSLocale)) { - CopyUTF8toUTF16(nsRFPService::GetSpoofedJSLocale(), lang); } // Case-order View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c3a2863... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c3a2863... You're receiving this email because of your account on gitlab.torproject.org.