public/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2026-03-22 04:34:44 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Remove root context check from Env

Browse Source 
This was only added [very briefly] when Env managed Origins, which it no longer
does.
This commit is contained in:
Karl Seguin
2026-03-11 08:21:35 +08:00
parent f6d0e484b0
commit dc3d2e9790
4 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/browser/Page.zig
View File

@@ -332,12 +332,11 @@ pub fn deinit(self: *Page, abort_http: bool) void {
session.releaseArena(qn.arena); session.releaseArena(qn.arena);
} }
const is_root = self.parent == null; session.browser.env.destroyContext(self.js);
session.browser.env.destroyContext(self.js, is_root);
self._script_manager.shutdown = true; self._script_manager.shutdown = true;
if (is_root) { if (self.parent == null) {
session.browser.http_client.abort(); session.browser.http_client.abort();
} else if (abort_http) { } else if (abort_http) {
// a small optimization, it's faster to abort _everything_ on the root // a small optimization, it's faster to abort _everything_ on the root

2
src/browser/Session.zig
View File

@@ -276,7 +276,7 @@ pub fn replacePage(self: *Session) !*Page {
var current = self.page.?; var current = self.page.?;
const frame_id = current._frame_id; const frame_id = current._frame_id;
current.deinit(false); current.deinit(true);
self.resetPageResources(); self.resetPageResources();
self.browser.env.memoryPressureNotification(.moderate); self.browser.env.memoryPressureNotification(.moderate);

10
src/browser/js/Env.zig
View File

@@ -342,7 +342,7 @@ pub fn createContext(self: *Env, page: *Page) !*Context {
return context; return context;
} }
pub fn destroyContext(self: *Env, context: *Context, is_root: bool) void { pub fn destroyContext(self: *Env, context: *Context) void {
for (self.contexts[0..self.context_count], 0..) |ctx, i| { for (self.contexts[0..self.context_count], 0..) |ctx, i| {
if (ctx == context) { if (ctx == context) {
// Swap with last element and decrement count // Swap with last element and decrement count
@@ -365,14 +365,6 @@ pub fn destroyContext(self: *Env, context: *Context, is_root: bool) void {
} }
context.deinit(); context.deinit();
if (is_root) {
// When the root is destroyed, all of our contexts should be gone.
// Origin cleanup happens in Session.resetPageResources.
if (comptime IS_DEBUG) {
std.debug.assert(self.context_count == 0);
}
}
} }
pub fn runMicrotasks(self: *Env) void { pub fn runMicrotasks(self: *Env) void {

2
src/cdp/cdp.zig
View File

@@ -759,7 +759,7 @@ const IsolatedWorld = struct {
pub fn removeContext(self: *IsolatedWorld) !void { pub fn removeContext(self: *IsolatedWorld) !void {
const ctx = self.context orelse return error.NoIsolatedContextToRemove; const ctx = self.context orelse return error.NoIsolatedContextToRemove;
self.browser.env.destroyContext(ctx, false); self.browser.env.destroyContext(ctx);
self.context = null; self.context = null;
} }