dec05eba/12to11
1
0
Fork 0
forked from 12to11/12to11
Code Pull requests Activity

Fix problems found with Firefox Nightly

Browse source 
* subsurface.c (Teardown): Correctly free subsurface actions.
* xdg_surface.c (NoteFrame): Fix conditions to avoid frame
callback spam.
This commit is contained in:
hujianwei 2022-10-23 11:56:35 +00:00
parent 0612e0df6e
commit 19f6f6454c
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
subsurface.c
View file

@ -798,7 +798,7 @@ Teardown (Surface *surface, Role *role)
{ {
Subsurface *subsurface; Subsurface *subsurface;
SurfaceActionClientData *client; SurfaceActionClientData *client;
SurfaceAction *action; SurfaceAction *action, *last;
Subcompositor *subcompositor; Subcompositor *subcompositor;
subsurface = SubsurfaceFromRole (role); subsurface = SubsurfaceFromRole (role);
@ -831,8 +831,11 @@ Teardown (Surface *surface, Role *role)
while (action != &client->actions) while (action != &client->actions)
{ {
if (action->subsurface == subsurface) last = action;
DestroySurfaceAction (action); action = action->next;
if (last->subsurface == subsurface)
DestroySurfaceAction (last);
} }
} }

6
xdg_surface.c
View file

@ -1295,9 +1295,6 @@ NoteFrame (FrameMode mode, uint64_t id, void *data)
/* End the frame. */ /* End the frame. */
XLFrameClockEndFrame (role->clock); XLFrameClockEndFrame (role->clock);
/* Clear the frame completed flag. */
role->state &= ~StateFrameStarted;
/* No frame was started clock-side for this frame. That /* No frame was started clock-side for this frame. That
means programs waiting for frame callbacks will not get means programs waiting for frame callbacks will not get
any, so the frame callbacks must be run by hand. */ any, so the frame callbacks must be run by hand. */
@ -1310,6 +1307,9 @@ NoteFrame (FrameMode mode, uint64_t id, void *data)
RunFrameCallbacksConditionally (role); RunFrameCallbacksConditionally (role);
} }
/* Clear the frame completed flag. */
role->state &= ~StateFrameStarted;
if (mode == ModePresented if (mode == ModePresented
&& renderer_flags & SupportsDirectPresent) && renderer_flags & SupportsDirectPresent)
{ {