iconGrid: Get max child size using existing array of visible children

Using a preexisting array to iterate over is much faster than iterating
over the actors children using a "for ... of" loop, that's because the
latter calls into C functions to get the next actor all the time.

Also, stop using array deconstruction here, it turned out that this is
extremely expensive. When profiling this part of the code, it turned out
that only 9% of the time spent in _getChildrenMaxSize() is spent calling
the get_preferred_height/width() methods. When not using array
deconstruction, this time increased to 22%, still not great, but a lot
better.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1713>
This commit is contained in:
Jonas Dreßler 2021-02-25 18:07:59 +01:00 committed by Marge Bot
parent 8e93806453
commit 0978b87e65

View File

@ -420,15 +420,19 @@ var IconGridLayout = GObject.registerClass({
let minWidth = 0; let minWidth = 0;
let minHeight = 0; let minHeight = 0;
for (const child of this._container) { const nPages = this._pages.length;
if (!child.visible) for (let pageIndex = 0; pageIndex < nPages; pageIndex++) {
continue; const page = this._pages[pageIndex];
const nVisibleItems = page.visibleChildren.length;
for (let itemIndex = 0; itemIndex < nVisibleItems; itemIndex++) {
const item = page.visibleChildren[itemIndex];
const [childMinHeight] = child.get_preferred_height(-1); const childMinHeight = item.get_preferred_height(-1)[0];
const [childMinWidth] = child.get_preferred_width(-1); const childMinWidth = item.get_preferred_width(-1)[0];
minWidth = Math.max(minWidth, childMinWidth); minWidth = Math.max(minWidth, childMinWidth);
minHeight = Math.max(minHeight, childMinHeight); minHeight = Math.max(minHeight, childMinHeight);
}
} }
this._childrenMaxSize = Math.max(minWidth, minHeight); this._childrenMaxSize = Math.max(minWidth, minHeight);