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

Bug 1757184 - Allocate display list nodes from nsPresArena instead of ArenaAllocator r=emilio

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D139863
This commit is contained in:
Miko Mynttinen 2022-02-28 19:16:04 +00:00
parent 8bd62e6e2d
commit ed38473dcc
2 changed files with 17 additions and 16 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

29
layout/painting/nsDisplayList.h
View file

@ -896,14 +896,17 @@ class nsDisplayListBuilder {
return mPool.Allocate(aId, aSize);
}
void* Allocate(size_t aSize, DisplayItemType aType) {
static_assert(size_t(DisplayItemType::TYPE_ZERO) ==
size_t(DisplayListArenaObjectId::CLIPCHAIN),
"");
#define DECLARE_DISPLAY_ITEM_TYPE(name_, ...) \
static_assert(size_t(DisplayItemType::TYPE_##name_) == \
size_t(DisplayListArenaObjectId::name_), \
"");
#include "nsDisplayItemTypesList.h"
static_assert(size_t(DisplayItemType::TYPE_MAX) ==
size_t(DisplayListArenaObjectId::CLIPCHAIN),
"");
static_assert(size_t(DisplayItemType::TYPE_MAX) + 1 ==
size_t(DisplayListArenaObjectId::LISTNODE),
"");
#undef DECLARE_DISPLAY_ITEM_TYPE
return Allocate(aSize, DisplayListArenaObjectId(size_t(aType)));
}
@ -1730,8 +1733,6 @@ class nsDisplayListBuilder {
*/
void ReuseDisplayItem(nsDisplayItem* aItem);
ListArenaAllocator& GetListAllocator() { return mListPool; }
private:
bool MarkOutOfFlowFrameForDisplay(nsIFrame* aDirtyFrame, nsIFrame* aFrame,
const nsRect& aVisibleRect,
@ -1930,8 +1931,6 @@ class nsDisplayListBuilder {
// Stores reusable items collected during display list preprocessing.
nsTHashSet<nsDisplayItem*> mReuseableItems;
ArenaAllocator<4096, 8> mListPool;
};
// All types are defined in nsDisplayItemTypes.h
@ -3050,8 +3049,7 @@ class nsDisplayList {
const_iterator begin() const { return iterator(mBottom); }
const_iterator end() const { return iterator(nullptr); }
explicit nsDisplayList(nsDisplayListBuilder* aBuilder)
: mPool(aBuilder->GetListAllocator()) {}
explicit nsDisplayList(nsDisplayListBuilder* aBuilder) : mBuilder(aBuilder) {}
nsDisplayList() = delete;
nsDisplayList(const nsDisplayList&) = delete;
@ -3070,12 +3068,12 @@ class nsDisplayList {
: mBottom(aOther.mBottom),
mTop(aOther.mTop),
mLength(aOther.mLength),
mPool(aOther.mPool) {
mBuilder(aOther.mBuilder) {
aOther.SetEmpty();
}
nsDisplayList& operator=(nsDisplayList&& aOther) {
MOZ_RELEASE_ASSERT(&mPool == &aOther.mPool);
MOZ_RELEASE_ASSERT(mBuilder == aOther.mBuilder);
if (this != &aOther) {
MOZ_RELEASE_ASSERT(IsEmpty());
@ -3132,7 +3130,7 @@ class nsDisplayList {
*/
void AppendToTop(nsDisplayList* aList) {
MOZ_ASSERT(aList != this);
MOZ_RELEASE_ASSERT(&mPool == &aList->mPool);
MOZ_RELEASE_ASSERT(mBuilder == aList->mBuilder);
if (aList->IsEmpty()) {
return;
@ -3343,13 +3341,14 @@ class nsDisplayList {
private:
inline Node* Allocate(nsDisplayItem* aItem) {
void* ptr = mPool.Allocate(sizeof(Node));
void* ptr =
mBuilder->Allocate(sizeof(Node), DisplayListArenaObjectId::LISTNODE);
return new (ptr) Node(aItem);
}
inline void Deallocate(Node* aNode) {
aNode->~Node();
// Memory remains reserved by the arena allocator.
mBuilder->Destroy(DisplayListArenaObjectId::LISTNODE, aNode);
}
void SetEmpty() {
@ -3361,7 +3360,7 @@ class nsDisplayList {
Node* mBottom = nullptr;
Node* mTop = nullptr;
size_t mLength = 0;
ListArenaAllocator& mPool;
nsDisplayListBuilder* mBuilder = nullptr;
#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
// This checks that the invariant of display lists owning their items is held.

4
layout/painting/nsDisplayListArenaTypes.h
View file

@ -7,7 +7,9 @@
/* a list of all types that can be allocated in the display list's nsPresArena,
for preprocessing */
DISPLAY_LIST_ARENA_OBJECT(CLIPCHAIN)
#define DECLARE_DISPLAY_ITEM_TYPE(name_, ...) DISPLAY_LIST_ARENA_OBJECT(name_)
DISPLAY_LIST_ARENA_OBJECT(UNUSED) // DisplayItemType::TYPE_ZERO
#include "nsDisplayItemTypesList.h"
#undef DECLARE_DISPLAY_ITEM_TYPE
DISPLAY_LIST_ARENA_OBJECT(CLIPCHAIN)
DISPLAY_LIST_ARENA_OBJECT(LISTNODE)