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

Add ClutterFrame arguments to after-paint signal handlers

Browse Source 
The ClutterFrame argument was added to several signals with mutter commit
08b0e563d4d0088e19d24f3199626a2d27349d09. We have a bunch of after-paint
handlers in gnome-shell too, and updating those was apparently forgotten,
introducing subtle memory corruption that was luckily easy to track down by
running gnome-shell with ASAN enabled. Let's fix that and add the additional
argument to all the signal handlers.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2629>
This commit is contained in:
Jonas Dreßler 2023-02-08 16:42:18 +01:00 committed by Marge Bot
parent 4c8648fb59
commit bd202c1847
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/shell-global.c
View File

@ -971,6 +971,7 @@ load_gl_symbol (const char *name,
static void static void
global_stage_after_paint (ClutterStage *stage, global_stage_after_paint (ClutterStage *stage,
ClutterStageView *stage_view, ClutterStageView *stage_view,
ClutterFrame *frame,
ShellGlobal *global) ShellGlobal *global)
{ {
/* At this point, we've finished all layout and painting, but haven't /* At this point, we've finished all layout and painting, but haven't

2
src/shell-screenshot.c
View File

@ -493,6 +493,7 @@ finish_screenshot (ShellScreenshot *screenshot,
static void static void
on_after_paint (ClutterStage *stage, on_after_paint (ClutterStage *stage,
ClutterStageView *view, ClutterStageView *view,
ClutterFrame *frame,
GTask *result) GTask *result)
{ {
ShellScreenshot *screenshot = g_task_get_task_data (result); ShellScreenshot *screenshot = g_task_get_task_data (result);
@ -628,6 +629,7 @@ shell_screenshot_screenshot_finish (ShellScreenshot *screenshot,
static void static void
screenshot_stage_to_content_on_after_paint (ClutterStage *stage, screenshot_stage_to_content_on_after_paint (ClutterStage *stage,
ClutterStageView *view, ClutterStageView *view,
ClutterFrame *frame,
GTask *result) GTask *result)
{ {
ShellScreenshot *screenshot = g_task_get_task_data (result); ShellScreenshot *screenshot = g_task_get_task_data (result);