From 830f759f0bf44da719355e427acf513a3ef74b29 Mon Sep 17 00:00:00 2001 From: Karl Seguin Date: Sat, 24 Jan 2026 07:37:30 +0800 Subject: [PATCH] zig fmt, remove unused code --- src/browser/js/Context.zig | 4 ++-- src/browser/js/ExecutionWorld.zig | 8 -------- src/browser/js/Local.zig | 3 ++- src/browser/js/Object.zig | 4 ---- src/browser/js/TryCatch.zig | 6 +----- src/browser/js/js.zig | 4 ---- src/browser/webapi/navigation/NavigationEventTarget.zig | 2 +- src/browser/webapi/streams/ReadableStream.zig | 2 +- .../webapi/streams/ReadableStreamDefaultController.zig | 4 ++-- src/cdp/cdp.zig | 5 ----- src/cdp/domains/page.zig | 4 ++-- 11 files changed, 11 insertions(+), 35 deletions(-) diff --git a/src/browser/js/Context.zig b/src/browser/js/Context.zig index de24fdb1..801ba782 100644 --- a/src/browser/js/Context.zig +++ b/src/browser/js/Context.zig @@ -872,7 +872,7 @@ pub fn startHeapProfiler(self: *Context) void { self.heap_profiler = heap_profiler; } -pub fn stopHeapProfiler(self: *Context) !struct{[]const u8, []const u8} { +pub fn stopHeapProfiler(self: *Context) !struct { []const u8, []const u8 } { var ls: js.Local.Scope = undefined; self.localScope(&ls); defer ls.deinit(); @@ -893,5 +893,5 @@ pub fn stopHeapProfiler(self: *Context) !struct{[]const u8, []const u8} { break :blk try ls.local.jsStringToZig(string_handle, .{}); }; - return .{allocating, snapshot}; + return .{ allocating, snapshot }; } diff --git a/src/browser/js/ExecutionWorld.zig b/src/browser/js/ExecutionWorld.zig index 8fe7a8dc..e468b167 100644 --- a/src/browser/js/ExecutionWorld.zig +++ b/src/browser/js/ExecutionWorld.zig @@ -134,11 +134,3 @@ pub fn removeContext(self: *ExecutionWorld) void { self.env.isolate.notifyContextDisposed(); _ = self.context_arena.reset(.{ .retain_with_limit = CONTEXT_ARENA_RETAIN }); } - -pub fn terminateExecution(self: *const ExecutionWorld) void { - self.env.isolate.terminateExecution(); -} - -pub fn resumeExecution(self: *const ExecutionWorld) void { - self.env.isolate.cancelTerminateExecution(); -} diff --git a/src/browser/js/Local.zig b/src/browser/js/Local.zig index 80b885f0..5ea91bae 100644 --- a/src/browser/js/Local.zig +++ b/src/browser/js/Local.zig @@ -1190,7 +1190,8 @@ fn _debugValue(self: *const Local, js_val: js.Value, seen: *std.AutoHashMapUnman const js_obj = js_val.toObject(); { // explicit scope because gop will become invalid in recursive call - const gop = try seen.getOrPut(self.call_arena, js_obj.getId()); + const obj_id: u32 = @bitCast(v8.v8__Object__GetIdentityHash(js_obj.handle)); + const gop = try seen.getOrPut(self.call_arena, obj_id); if (gop.found_existing) { return writer.writeAll("\n"); } diff --git a/src/browser/js/Object.zig b/src/browser/js/Object.zig index 7c7f0e6c..1306234c 100644 --- a/src/browser/js/Object.zig +++ b/src/browser/js/Object.zig @@ -31,10 +31,6 @@ const Object = @This(); local: *const js.Local, handle: *const v8.Object, -pub fn getId(self: Object) u32 { - return @bitCast(v8.v8__Object__GetIdentityHash(self.handle)); -} - pub fn has(self: Object, key: anytype) bool { const ctx = self.local.ctx; const key_handle = if (@TypeOf(key) == *const v8.String) key else ctx.isolate.initStringHandle(key); diff --git a/src/browser/js/TryCatch.zig b/src/browser/js/TryCatch.zig index 8f9df5f5..ca7f70b8 100644 --- a/src/browser/js/TryCatch.zig +++ b/src/browser/js/TryCatch.zig @@ -32,12 +32,8 @@ pub fn init(self: *TryCatch, l: *const js.Local) void { v8.v8__TryCatch__CONSTRUCT(&self.handle, l.isolate.handle); } -pub fn hasCaught(self: TryCatch) bool { - return v8.v8__TryCatch__HasCaught(&self.handle); -} - pub fn caught(self: TryCatch, allocator: Allocator) ?Caught { - if (!self.hasCaught()) { + if (!v8.v8__TryCatch__HasCaught(&self.handle)) { return null; } diff --git a/src/browser/js/js.zig b/src/browser/js/js.zig index b054ae1f..e461a878 100644 --- a/src/browser/js/js.zig +++ b/src/browser/js/js.zig @@ -81,10 +81,6 @@ pub const ArrayBuffer = struct { pub const Exception = struct { local: *const Local, handle: *const v8.Value, - - pub fn exception(self: Exception, allocator: Allocator) ![]const u8 { - return self.local.valueToString(self.handel, .{ .allocator = allocator }); - } }; // These are simple types that we can convert to JS with only an isolate. This diff --git a/src/browser/webapi/navigation/NavigationEventTarget.zig b/src/browser/webapi/navigation/NavigationEventTarget.zig index 44355ae1..c89831d8 100644 --- a/src/browser/webapi/navigation/NavigationEventTarget.zig +++ b/src/browser/webapi/navigation/NavigationEventTarget.zig @@ -49,7 +49,7 @@ pub fn dispatch(self: *NavigationEventTarget, event_type: DispatchType, page: *P if (comptime IS_DEBUG) { if (page.js.local == null) { - log.fatal(.bug, "null context scope", .{.src = "NavigationEventTarget.dispatch", .url = page.url}); + log.fatal(.bug, "null context scope", .{ .src = "NavigationEventTarget.dispatch", .url = page.url }); std.debug.assert(page.js.local != null); } } diff --git a/src/browser/webapi/streams/ReadableStream.zig b/src/browser/webapi/streams/ReadableStream.zig index bdb88ae3..64c1b529 100644 --- a/src/browser/webapi/streams/ReadableStream.zig +++ b/src/browser/webapi/streams/ReadableStream.zig @@ -143,7 +143,7 @@ pub fn callPullIfNeeded(self: *ReadableStream) !void { if (comptime IS_DEBUG) { if (self._page.js.local == null) { - log.fatal(.bug, "null context scope", .{.src = "ReadableStream.callPullIfNeeded", .url = self._page.url}); + log.fatal(.bug, "null context scope", .{ .src = "ReadableStream.callPullIfNeeded", .url = self._page.url }); std.debug.assert(self._page.js.local != null); } } diff --git a/src/browser/webapi/streams/ReadableStreamDefaultController.zig b/src/browser/webapi/streams/ReadableStreamDefaultController.zig index 7d868a11..c2f750bc 100644 --- a/src/browser/webapi/streams/ReadableStreamDefaultController.zig +++ b/src/browser/webapi/streams/ReadableStreamDefaultController.zig @@ -86,7 +86,7 @@ pub fn enqueue(self: *ReadableStreamDefaultController, chunk: Chunk) !void { if (comptime IS_DEBUG) { if (self._page.js.local == null) { - log.fatal(.bug, "null context scope", .{.src = "ReadableStreamDefaultController.enqueue", .url = self._page.url}); + log.fatal(.bug, "null context scope", .{ .src = "ReadableStreamDefaultController.enqueue", .url = self._page.url }); std.debug.assert(self._page.js.local != null); } } @@ -113,7 +113,7 @@ pub fn close(self: *ReadableStreamDefaultController) !void { if (comptime IS_DEBUG) { if (self._page.js.local == null) { - log.fatal(.bug, "null context scope", .{.src = "ReadableStreamDefaultController.close", .url = self._page.url}); + log.fatal(.bug, "null context scope", .{ .src = "ReadableStreamDefaultController.close", .url = self._page.url }); std.debug.assert(self._page.js.local != null); } } diff --git a/src/cdp/cdp.zig b/src/cdp/cdp.zig index 77378d58..3f0af4a8 100644 --- a/src/cdp/cdp.zig +++ b/src/cdp/cdp.zig @@ -771,11 +771,6 @@ const IsolatedWorld = struct { false, ); } - - pub fn createContextAndLoadPolyfills(self: *IsolatedWorld, page: *Page) !void { - // We need to recreate the isolated world context - try self.createContext(page); - } }; // This is a generic because when we send a result we have two different diff --git a/src/cdp/domains/page.zig b/src/cdp/domains/page.zig index 0209ef67..de368821 100644 --- a/src/cdp/domains/page.zig +++ b/src/cdp/domains/page.zig @@ -190,7 +190,7 @@ fn createIsolatedWorld(cmd: anytype) !void { const world = try bc.createIsolatedWorld(params.worldName, params.grantUniveralAccess); const page = bc.session.currentPage() orelse return error.PageNotLoaded; - try world.createContextAndLoadPolyfills(page); + try world.createContext(page); const js_context = &world.executor.context.?; // Create the auxdata json for the contextCreated event @@ -292,7 +292,7 @@ pub fn pageRemove(bc: anytype) !void { pub fn pageCreated(bc: anytype, page: *Page) !void { for (bc.isolated_worlds.items) |*isolated_world| { - try isolated_world.createContextAndLoadPolyfills(page); + try isolated_world.createContext(page); } }