nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1880928 - Make ResizeObserver::mCallback a ResizeObserverCallback again. r=Oriol

Browse source 
Essentially reverting D154324 since we no longer need it to accept
internal callback functions.

Differential Revision: https://phabricator.services.mozilla.com/D202555
This commit is contained in:
Frédéric Wang 2024-02-29 08:50:57 +00:00
parent c9e3e2d833
commit e31798198b
3 changed files with 9 additions and 52 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
dom/base/Document.cpp
View file

@ -17171,13 +17171,7 @@ bool Document::IsExtensionPage() const {
void Document::AddResizeObserver(ResizeObserver& aObserver) {
MOZ_ASSERT(!mResizeObservers.Contains(&aObserver));
// Insert internal ResizeObservers before scripted ones, since they may have
// observable side-effects and we don't want to expose the insertion time.
if (aObserver.HasNativeCallback()) {
mResizeObservers.InsertElementAt(0, &aObserver);
} else {
mResizeObservers.AppendElement(&aObserver);
}
mResizeObservers.AppendElement(&aObserver);
}
void Document::RemoveResizeObserver(ResizeObserver& aObserver) {

39
dom/base/ResizeObserver.cpp
View file

@ -214,23 +214,14 @@ void ResizeObservation::UpdateLastReportedSize(
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_CLASS(ResizeObserver)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(ResizeObserver)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mOwner, mDocument, mActiveTargets,
mObservationMap);
if (tmp->mCallback.is<RefPtr<ResizeObserverCallback>>()) {
ImplCycleCollectionTraverse(
cb, tmp->mCallback.as<RefPtr<ResizeObserverCallback>>(), "mCallback",
0);
}
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mOwner, mDocument, mCallback,
mActiveTargets, mObservationMap);
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(ResizeObserver)
tmp->Disconnect();
NS_IMPL_CYCLE_COLLECTION_UNLINK(mOwner, mDocument, mActiveTargets,
NS_IMPL_CYCLE_COLLECTION_UNLINK(mOwner, mDocument, mCallback, mActiveTargets,
mObservationMap);
if (tmp->mCallback.is<RefPtr<ResizeObserverCallback>>()) {
ImplCycleCollectionUnlink(
tmp->mCallback.as<RefPtr<ResizeObserverCallback>>());
}
NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
@ -241,14 +232,6 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ResizeObserver)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_INTERFACE_MAP_END
ResizeObserver::ResizeObserver(Document& aDocument, NativeCallback aCallback)
: mOwner(aDocument.GetInnerWindow()),
mDocument(&aDocument),
mCallback(aCallback) {
MOZ_ASSERT(mOwner, "Need a non-null owner window");
MOZ_ASSERT(mDocument == mOwner->GetExtantDoc());
}
already_AddRefed<ResizeObserver> ResizeObserver::Constructor(
const GlobalObject& aGlobal, ResizeObserverCallback& aCb,
ErrorResult& aRv) {
@ -354,12 +337,7 @@ void ResizeObserver::GatherActiveObservations(uint32_t aDepth) {
if (targetDepth > aDepth) {
mActiveTargets.AppendElement(observation);
} else {
// This boolean is only used to indicate we will deliver resize loop error
// notification later on. However, we don't want to do that for our
// internal observers.
if (!HasNativeCallback()) {
mHasSkippedTargets = true;
}
mHasSkippedTargets = true;
}
}
}
@ -412,13 +390,8 @@ uint32_t ResizeObserver::BroadcastActiveObservations() {
}
}
if (mCallback.is<RefPtr<ResizeObserverCallback>>()) {
RefPtr<ResizeObserverCallback> callback(
mCallback.as<RefPtr<ResizeObserverCallback>>());
callback->Call(this, entries, *this);
} else {
mCallback.as<NativeCallback>()(entries, *this);
}
RefPtr<ResizeObserverCallback> callback(mCallback);
callback->Call(this, entries, *this);
mActiveTargets.Clear();
mHasSkippedTargets = false;

14
dom/base/ResizeObserver.h
View file

@ -121,9 +121,6 @@ class ResizeObservation final : public LinkedListElement<ResizeObservation> {
* https://drafts.csswg.org/resize-observer/#api
*/
class ResizeObserver final : public nsISupports, public nsWrapperCache {
using NativeCallback = void (*)(
const Sequence<OwningNonNull<ResizeObserverEntry>>&, ResizeObserver&);
ResizeObserver(Document& aDocument, NativeCallback aCallback);
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@ -131,9 +128,7 @@ class ResizeObserver final : public nsISupports, public nsWrapperCache {
ResizeObserver(nsCOMPtr<nsPIDOMWindowInner>&& aOwner, Document* aDocument,
ResizeObserverCallback& aCb)
: mOwner(std::move(aOwner)),
mDocument(aDocument),
mCallback(RefPtr<ResizeObserverCallback>(&aCb)) {
: mOwner(std::move(aOwner)), mDocument(aDocument), mCallback(&aCb) {
MOZ_ASSERT(mOwner, "Need a non-null owner window");
MOZ_ASSERT(mDocument, "Need a non-null doc");
MOZ_ASSERT(mDocument == mOwner->GetExtantDoc());
@ -176,11 +171,6 @@ class ResizeObserver final : public nsISupports, public nsWrapperCache {
*/
bool HasSkippedObservations() const { return mHasSkippedTargets; }
/**
* Returns whether this is an internal ResizeObserver with a native callback.
*/
bool HasNativeCallback() const { return mCallback.is<NativeCallback>(); }
/**
* Invoke the callback function in JavaScript for all active observations
* and pass the sequence of ResizeObserverEntry so JavaScript can access them.
@ -213,7 +203,7 @@ class ResizeObserver final : public nsISupports, public nsWrapperCache {
nsCOMPtr<nsPIDOMWindowInner> mOwner;
// The window's document at the time of ResizeObserver creation.
RefPtr<Document> mDocument;
Variant<RefPtr<ResizeObserverCallback>, NativeCallback> mCallback;
RefPtr<ResizeObserverCallback> mCallback;
nsTArray<RefPtr<ResizeObservation>> mActiveTargets;
// The spec uses a list to store the skipped targets. However, it seems what
// we want is to check if there are any skipped targets (i.e. existence).