diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 15:12:12 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 15:12:12 +0000 |
| commit | a7c14e2f29831f4bc5eb18e23e55eb6f7a4e3431 (patch) | |
| tree | 54617b4f5f04ee87a2c9e3b97cc88b8626859124 /dom/base | |
| parent | Releasing progress-linux version 115.7.0esr-1~deb12u1progress7u1. (diff) | |
| download | firefox-esr-a7c14e2f29831f4bc5eb18e23e55eb6f7a4e3431.tar.xz firefox-esr-a7c14e2f29831f4bc5eb18e23e55eb6f7a4e3431.zip | |
Merging upstream version 115.8.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dom/base')
| -rw-r--r-- | dom/base/PointerLockManager.cpp | 4 | ||||
| -rw-r--r-- | dom/base/nsContentUtils.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
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<nsPresContext> 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<EventStateManager> 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, "*"); } } |