From a7c14e2f29831f4bc5eb18e23e55eb6f7a4e3431 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 8 Apr 2024 17:12:12 +0200 Subject: Merging upstream version 115.8.0esr. Signed-off-by: Daniel Baumann --- dom/base/PointerLockManager.cpp | 4 ++-- dom/base/nsContentUtils.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'dom/base') diff --git a/dom/base/PointerLockManager.cpp b/dom/base/PointerLockManager.cpp index 78f1d600af..4ec9d76abf 100644 --- a/dom/base/PointerLockManager.cpp +++ b/dom/base/PointerLockManager.cpp @@ -265,7 +265,7 @@ bool PointerLockManager::SetPointerLock(Element* aElement, Document* aDocument, } return false; } - nsPresContext* presContext = presShell->GetPresContext(); + RefPtr presContext = presShell->GetPresContext(); if (!presContext) { NS_WARNING("SetPointerLock(): Unable to get PresContext"); return false; @@ -288,7 +288,7 @@ bool PointerLockManager::SetPointerLock(Element* aElement, Document* aDocument, // Hide the cursor and set pointer lock for future mouse events RefPtr esm = presContext->EventStateManager(); esm->SetCursor(aCursorStyle, nullptr, {}, Nothing(), widget, true); - EventStateManager::SetPointerLock(widget, aElement); + EventStateManager::SetPointerLock(widget, presContext); return true; } diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index fd1dc60463..13a54f0214 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -10961,7 +10961,7 @@ bool nsContentUtils::IsURIInList(nsIURI* aURI, const nsCString& aList) { if (startIndexOfNextLevel <= 0) { break; } - host = "*"_ns + nsDependentCSubstring(host, startIndexOfNextLevel); + host.ReplaceLiteral(0, startIndexOfNextLevel, "*"); } } -- cgit v1.2.3