corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1925188 - Don't abort pending promise by screen.orientation.lock during change event. r=dom-core,edgar

Browse Source 
We should clear pending orientation lock promise in document before change
event is dispatched. After that, we should resolve this promise.

Differential Revision: https://phabricator.services.mozilla.com/D225945
This commit is contained in:
Makoto Kato
2024-10-21 01:20:32 +00:00
parent b58dd981f5
commit 40283178a6
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dom/base/ScreenOrientation.cpp
View File

@@ -802,15 +802,18 @@ ScreenOrientation::DispatchChangeEventAndResolvePromise() {
RefPtr<ScreenOrientation> self = this; RefPtr<ScreenOrientation> self = this;
return NS_NewRunnableFunction( return NS_NewRunnableFunction(
"dom::ScreenOrientation::DispatchChangeEvent", [self, doc]() { "dom::ScreenOrientation::DispatchChangeEvent", [self, doc]() {
DebugOnly<nsresult> rv = self->DispatchTrustedEvent(u"change"_ns); RefPtr<Promise> pendingPromise;
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "DispatchTrustedEvent failed");
if (doc) { if (doc) {
Promise* pendingPromise = doc->GetOrientationPendingPromise(); pendingPromise = doc->GetOrientationPendingPromise();
if (pendingPromise) { if (pendingPromise) {
pendingPromise->MaybeResolveWithUndefined();
doc->ClearOrientationPendingPromise(); doc->ClearOrientationPendingPromise();
} }
} }
DebugOnly<nsresult> rv = self->DispatchTrustedEvent(u"change"_ns);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "DispatchTrustedEvent failed");
if (pendingPromise) {
pendingPromise->MaybeResolveWithUndefined();
}
}); });
} }

2
testing/web-platform/meta/screen-orientation/lock-unlock-check.html.ini
View File

@@ -4,9 +4,11 @@
[Unlocking the screen orientation after a change event must not abort] [Unlocking the screen orientation after a change event must not abort]
expected: expected:
if (os == "mac") and debug: [FAIL, NOTRUN] if (os == "mac") and debug: [FAIL, NOTRUN]
if (os == "android"): PASS
FAIL FAIL
[Re-locking the screen orientation after a change event fires must not abort] [Re-locking the screen orientation after a change event fires must not abort]
expected: expected:
if (os == "mac") and debug: [FAIL, TIMEOUT] if (os == "mac") and debug: [FAIL, TIMEOUT]
if (os == "android"): PASS
FAIL FAIL