merge main

This commit is contained in:
Karl Seguin
2026-03-09 17:18:50 +08:00
parent 7d90c3f582
commit 7348a68c84
3 changed files with 7 additions and 5 deletions

View File

@@ -608,7 +608,7 @@ fn scheduleNavigationWithArena(originator: *Page, arena: Allocator, request_url:
}; };
if (target._queued_navigation) |existing| { if (target._queued_navigation) |existing| {
target.arena_pool.release(existing.arena); session.releaseArena(existing.arena);
} }
target._queued_navigation = qn; target._queued_navigation = qn;

View File

@@ -19,6 +19,7 @@
const std = @import("std"); const std = @import("std");
const js = @import("../../js/js.zig"); const js = @import("../../js/js.zig");
const Page = @import("../../Page.zig"); const Page = @import("../../Page.zig");
const Session = @import("../../Session.zig");
const Allocator = std.mem.Allocator; const Allocator = std.mem.Allocator;
@@ -41,8 +42,8 @@ pub fn init(family: []const u8, source: []const u8, page: *Page) !*FontFace {
return self; return self;
} }
pub fn deinit(self: *FontFace, _: bool, page: *Page) void { pub fn deinit(self: *FontFace, _: bool, session: *Session) void {
page.releaseArena(self._arena); session.releaseArena(self._arena);
} }
pub fn getFamily(self: *const FontFace) []const u8 { pub fn getFamily(self: *const FontFace) []const u8 {

View File

@@ -19,6 +19,7 @@
const std = @import("std"); const std = @import("std");
const js = @import("../../js/js.zig"); const js = @import("../../js/js.zig");
const Page = @import("../../Page.zig"); const Page = @import("../../Page.zig");
const Session = @import("../../Session.zig");
const FontFace = @import("FontFace.zig"); const FontFace = @import("FontFace.zig");
const Allocator = std.mem.Allocator; const Allocator = std.mem.Allocator;
@@ -38,8 +39,8 @@ pub fn init(page: *Page) !*FontFaceSet {
return self; return self;
} }
pub fn deinit(self: *FontFaceSet, _: bool, page: *Page) void { pub fn deinit(self: *FontFaceSet, _: bool, session: *Session) void {
page.releaseArena(self._arena); session.releaseArena(self._arena);
} }
// FontFaceSet.ready - returns an already-resolved Promise. // FontFaceSet.ready - returns an already-resolved Promise.