mirror of
https://github.com/lightpanda-io/browser.git
synced 2026-02-04 14:33:47 +00:00
fix legacy runner, manual merge
This commit is contained in:
@@ -245,9 +245,9 @@ pub fn deliverEntries(self: *IntersectionObserver, page: *Page) !void {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const entries = try self.takeRecords(page);
|
const entries = try self.takeRecords(page);
|
||||||
var result: js.Function.Result = undefined;
|
var caught: js.TryCatch.Caught = undefined;
|
||||||
self._callback.tryCall(void, .{ entries, self }, &result) catch |err| {
|
self._callback.tryCall(void, .{ entries, self }, &caught) catch |err| {
|
||||||
log.err(.page, "IntsctObserver.deliverEntries", .{ .err = result.exception, .stack = result.stack });
|
log.err(.page, "IntsctObserver.deliverEntries", .{ .err = err, .caught = caught });
|
||||||
return err;
|
return err;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -248,9 +248,9 @@ pub fn deliverRecords(self: *MutationObserver, page: *Page) !void {
|
|||||||
// Take a copy of the records and clear the list before calling callback
|
// Take a copy of the records and clear the list before calling callback
|
||||||
// This ensures mutations triggered during the callback go into a fresh list
|
// This ensures mutations triggered during the callback go into a fresh list
|
||||||
const records = try self.takeRecords(page);
|
const records = try self.takeRecords(page);
|
||||||
var result: js.Function.Result = undefined;
|
var caught: js.TryCatch.Caught = undefined;
|
||||||
self._callback.tryCall(void, .{ records, self }, &result) catch |err| {
|
self._callback.tryCall(void, .{ records, self }, &caught) catch |err| {
|
||||||
log.err(.page, "MutObserver.deliverRecords", .{ .err = result.exception, .stack = result.stack });
|
log.err(.page, "MutObserver.deliverRecords", .{ .err = err, .caught = caught });
|
||||||
return err;
|
return err;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -151,9 +151,9 @@ pub inline fn hasRecords(self: *const PerformanceObserver) bool {
|
|||||||
/// Runs the PerformanceObserver's callback with records; emptying it out.
|
/// Runs the PerformanceObserver's callback with records; emptying it out.
|
||||||
pub fn dispatch(self: *PerformanceObserver, page: *Page) !void {
|
pub fn dispatch(self: *PerformanceObserver, page: *Page) !void {
|
||||||
const records = try self.takeRecords(page);
|
const records = try self.takeRecords(page);
|
||||||
var result: js.Function.Result = undefined;
|
var caught: js.TryCatch.Caught = undefined;
|
||||||
self._callback.tryCall(void, .{ EntryList{ ._entries = records }, self }, &result) catch |err| {
|
self._callback.tryCall(void, .{ EntryList{ ._entries = records }, self }, &caught) catch |err| {
|
||||||
log.err(.page, "PerfObserver.dispatch", .{ .err = result.exception, .stack = result.stack });
|
log.err(.page, "PerfObserver.dispatch", .{ .err = err, .caught = caught });
|
||||||
return err;
|
return err;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -94,9 +94,8 @@ pub fn run(allocator: Allocator, file: []const u8, session: *lp.Session) !void {
|
|||||||
_ = session.wait(2000);
|
_ = session.wait(2000);
|
||||||
|
|
||||||
js_context.eval("testing.assertOk()", "testing.assertOk()") catch |err| {
|
js_context.eval("testing.assertOk()", "testing.assertOk()") catch |err| {
|
||||||
const msg = try_catch.err(allocator) catch @errorName(err) orelse "unknown";
|
const caught = try_catch.caughtOrError(allocator, err);
|
||||||
|
std.debug.print("{s}: test failure\nError: {f}\n", .{ file, caught });
|
||||||
std.debug.print("{s}: test failure\nError: {s}\n", .{ file, msg });
|
|
||||||
return err;
|
return err;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user