brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iconGrid: Eliminate JavaScript for painting/picking

Browse Source 
The only reason for `vfunc_paint` and `vfunc_pick` existing was to
implement a culling optimization. Although that optimization actually
made performance worse than none at all because it forced the painting
and picking cycles to spend more time calling into JavaScript.

Turns out we don't have to choose between native code and culling though.
Just reimplement the culling using native ClutterActor functions and we
get the benefits of both.

Performance on an i7-7700:

Moving the cursor over the icon grid:
Before: 70% CPU, 5.5ms per frame
After : 60% CPU, 4.5ms per frame

Scrolling the icon grid:
Before: 60% CPU, 4.4ms per frame
After : 50% CPU, 3.3ms per frame

Helps with https://gitlab.gnome.org/GNOME/gnome-shell/issues/174
This commit is contained in:
Daniel van Vugt 2018-11-23 16:43:34 +08:00 committed by Florian Müllner
parent 4c11d15a07
commit 0e0574a0b4
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
js/ui/iconGrid.js
View File

@ -344,10 +344,10 @@ var IconGrid = new Lang.Class({
if (this._rowLimit && rowIndex >= this._rowLimit || if (this._rowLimit && rowIndex >= this._rowLimit ||
this._fillParent && childBox.y2 > availHeight - this.bottomPadding) { this._fillParent && childBox.y2 > availHeight - this.bottomPadding) {
children[i]._skipPaint = true; children[i].hide();
} else { } else {
children[i].allocate(childBox, flags); children[i].allocate(childBox, flags);
children[i]._skipPaint = false; children[i].show();
} }
columnIndex++; columnIndex++;
@ -365,24 +365,6 @@ var IconGrid = new Lang.Class({
} }
}, },
vfunc_paint() {
this.paint_background();
this.get_children().forEach(c => {
if (!c._skipPaint)
c.paint();
});
},
vfunc_pick(color) {
this.parent(color);
this.get_children().forEach(c => {
if (!c._skipPaint)
c.paint();
});
},
vfunc_get_paint_volume(paintVolume) { vfunc_get_paint_volume(paintVolume) {
// Setting the paint volume does not make sense when we don't have // Setting the paint volume does not make sense when we don't have
// any allocation // any allocation
@ -412,9 +394,6 @@ var IconGrid = new Lang.Class({
if (!child.visible) if (!child.visible)
continue; continue;
if (child._skipPaint)
continue;
let childVolume = child.get_transformed_paint_volume(this); let childVolume = child.get_transformed_paint_volume(this);
if (!childVolume) if (!childVolume)
return false return false
@ -714,7 +693,7 @@ var IconGrid = new Lang.Class({
}, },
visibleItemsCount() { visibleItemsCount() {
return this.get_children().filter(c => !c._skipPaint).length; return this.get_children().filter(c => c.is_visible()).length;
}, },
setSpacing(spacing) { setSpacing(spacing) {
@ -859,7 +838,7 @@ var PaginatedIconGrid = new Lang.Class({
for (let i = 0; i < children.length; i++) { for (let i = 0; i < children.length; i++) {
let childBox = this._calculateChildBox(children[i], x, y, box); let childBox = this._calculateChildBox(children[i], x, y, box);
children[i].allocate(childBox, flags); children[i].allocate(childBox, flags);
children[i]._skipPaint = false; children[i].show();
columnIndex++; columnIndex++;
if (columnIndex == nColumns) { if (columnIndex == nColumns) {