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
-
50260f8e
by hackademix at 2025-07-22T10:06:43+02:00
3 changed files:
Changes:
| ... | ... | @@ -791,8 +791,8 @@ void nsObjectLoadingContent::MaybeRewriteYoutubeEmbed(nsIURI* aURI, |
| 791 | 791 | path.ReplaceSubstring("/v/"_ns, "/embed/"_ns);
|
| 792 | 792 | NS_ConvertUTF8toUTF16 utf16URI(prePath);
|
| 793 | 793 | AppendUTF8toUTF16(path, utf16URI);
|
| 794 | - rv = nsContentUtils::NewURIWithDocumentCharset(aRewrittenURI, utf16URI, doc,
|
|
| 795 | - aBaseURI);
|
|
| 794 | + rv = nsContentUtils::NewURIWithDocumentCharset(
|
|
| 795 | + aRewrittenURI, utf16URI, thisContent->OwnerDoc(), aBaseURI);
|
|
| 796 | 796 | if (NS_FAILED(rv)) {
|
| 797 | 797 | return;
|
| 798 | 798 | }
|
| ... | ... | @@ -66,8 +66,6 @@ class txXPathNode { |
| 66 | 66 | bool operator!=(const txXPathNode& aNode) const { return !(*this == aNode); }
|
| 67 | 67 | ~txXPathNode() { MOZ_COUNT_DTOR(txXPathNode); }
|
| 68 | 68 | |
| 69 | - mozilla::dom::Document* OwnerDoc() const { return mNode->OwnerDoc(); }
|
|
| 70 | - |
|
| 71 | 69 | private:
|
| 72 | 70 | friend class txXPathNativeNode;
|
| 73 | 71 | friend class txXPathNodeUtils;
|
| ... | ... | @@ -14,13 +14,10 @@ |
| 14 | 14 | |
| 15 | 15 | #include "mozilla/CheckedInt.h"
|
| 16 | 16 | #include "mozilla/UniquePtrExtensions.h"
|
| 17 | -#include "nsRFPService.h"
|
|
| 18 | 17 | |
| 19 | 18 | using mozilla::CheckedUint32;
|
| 20 | 19 | using mozilla::MakeUnique;
|
| 21 | 20 | using mozilla::MakeUniqueFallible;
|
| 22 | -using mozilla::nsRFPService;
|
|
| 23 | -using mozilla::RFPTarget;
|
|
| 24 | 21 | using mozilla::UniquePtr;
|
| 25 | 22 | |
| 26 | 23 | /*
|
| ... | ... | @@ -78,10 +75,6 @@ nsresult txNodeSorter::addSortElement(Expr* aSelectExpr, Expr* aLangExpr, |
| 78 | 75 | if (aLangExpr) {
|
| 79 | 76 | rv = aLangExpr->evaluateToString(aContext, lang);
|
| 80 | 77 | NS_ENSURE_SUCCESS(rv, rv);
|
| 81 | - } else if (aContext->getContextNode()
|
|
| 82 | - .OwnerDoc()
|
|
| 83 | - ->ShouldResistFingerprinting(RFPTarget::JSLocale)) {
|
|
| 84 | - CopyUTF8toUTF16(nsRFPService::GetSpoofedJSLocale(), lang);
|
|
| 85 | 78 | }
|
| 86 | 79 | |
| 87 | 80 | // Case-order
|