public/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2026-03-29 16:10:04 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix Context's call_arena

Browse Source 
The Context's call_arena should be based on the source, e.g. the IsolateWorld
or the Page, not always the page. There's no rule that says all Contexts have
to be a subset of the Page, and thus some might live longer and by doing so
outlive the page_arena.

Also, on context cleanup, isolate worlds now cleanup their identity.
This commit is contained in:
Karl Seguin
2026-03-20 16:50:03 +08:00
parent f70865e174
commit 88681b1fdb
5 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cdp/cdp.zig
View File

@@ -492,9 +492,13 @@ pub fn BrowserContext(comptime CDP_T: type) type {
const arena = try browser.arena_pool.acquire(.{ .debug = "IsolatedWorld" });
errdefer browser.arena_pool.release(arena);
const call_arena = try browser.arena_pool.acquire(.{ .debug = "IsolatedWorld.call_arena" });
errdefer browser.arena_pool.release(call_arena);
const world = try arena.create(IsolatedWorld);
world.* = .{
.arena = arena,
.call_arena = call_arena,
.context = null,
.browser = browser,
.name = try arena.dupe(u8, world_name),
@@ -745,6 +749,7 @@ pub fn BrowserContext(comptime CDP_T: type) type {
/// An object id is unique across all contexts, different object ids can refer to the same Node in different contexts.
const IsolatedWorld = struct {
arena: Allocator,
call_arena: Allocator,
browser: *Browser,
name: []const u8,
context: ?*js.Context = null,
@@ -757,6 +762,7 @@ const IsolatedWorld = struct {
pub fn deinit(self: *IsolatedWorld) void {
self.removeContext() catch {};
self.identity.deinit();
self.browser.arena_pool.release(self.call_arena);
self.browser.arena_pool.release(self.arena);
}
@@ -764,6 +770,8 @@ const IsolatedWorld = struct {
const ctx = self.context orelse return error.NoIsolatedContextToRemove;
self.browser.env.destroyContext(ctx);
self.context = null;
self.identity.deinit();
self.identity = .{};
}
// The isolate world must share at least some of the state with the related page, specifically the DocumentHTML
@@ -776,6 +784,7 @@ const IsolatedWorld = struct {
const ctx = try self.browser.env.createContext(page, .{
.identity = &self.identity,
.identity_arena = self.arena,
.call_arena = self.call_arena,
.debug_name = "IsolatedContext",
});
self.context = ctx;