mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-06 03:09:18 +02:00
de258a4e58
By resolving the relevant promises, instead of crashing (and if we didn't crash we'd leave the window registered as a refresh driver observer, which would be bad). I wanted to reject them, since that's what we do when the page has no pres shell, but that'd make this test fail: https://searchfox.org/mozilla-central/rev/d8194cbbeaec11962ed67f83aea9984bf38f7c63/dom/base/test/browser_promiseDocumentFlushed.js#165-186 For this, we modify the OneShotPostRefreshObserver API to be more generic (and rename it OneShotManagedRefreshObserver). We fix APZ's usage of this API, which was doing something extremely weird (returning a refcounted object in a UniquePtr). This seems like an artifact from recent OneShotPostRefreshObserver cleanup. Differential Revision: https://phabricator.services.mozilla.com/D111851
50 lines
1.6 KiB
C++
50 lines
1.6 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "nsRefreshObservers.h"
|
|
#include "PresShell.h"
|
|
|
|
namespace mozilla {
|
|
|
|
ManagedPostRefreshObserver::ManagedPostRefreshObserver(PresShell* aPresShell,
|
|
Action&& aAction)
|
|
: mPresShell(aPresShell), mAction(std::move(aAction)) {}
|
|
|
|
ManagedPostRefreshObserver::ManagedPostRefreshObserver(PresShell* aPresShell)
|
|
: mPresShell(aPresShell) {}
|
|
|
|
ManagedPostRefreshObserver::~ManagedPostRefreshObserver() = default;
|
|
|
|
void ManagedPostRefreshObserver::Cancel() {
|
|
mAction(true);
|
|
mAction = nullptr;
|
|
mPresShell = nullptr;
|
|
}
|
|
|
|
void ManagedPostRefreshObserver::DidRefresh() {
|
|
if (!mPresShell) {
|
|
MOZ_ASSERT_UNREACHABLE(
|
|
"Post-refresh observer fired again after failed attempt at "
|
|
"unregistering it");
|
|
return;
|
|
}
|
|
Unregister unregister = mAction(false);
|
|
if (bool(unregister)) {
|
|
nsPresContext* presContext = mPresShell->GetPresContext();
|
|
if (!presContext) {
|
|
MOZ_ASSERT_UNREACHABLE(
|
|
"Unable to unregister post-refresh observer! Leaking it instead of "
|
|
"leaving garbage registered");
|
|
// Graceful handling, just in case...
|
|
mPresShell = nullptr;
|
|
mAction = nullptr;
|
|
return;
|
|
}
|
|
presContext->UnregisterManagedPostRefreshObserver(this);
|
|
}
|
|
}
|
|
|
|
} // namespace mozilla
|