Lightpanda: the headless browser designed for AI and automation
iframe: reflect and react to the src attribute
Adrià Arrufatcac9a7b940cb
diff --git a/src/browser/Frame.zig b/src/browser/Frame.zigindex cad80ab7f..66029c5cd 100644--- a/src/browser/Frame.zig+++ b/src/browser/Frame.zig@@ -1317,9 +1317,9 @@ fn iframeCompletedLoading(self: *Frame, iframe: *IFrame, delays_load: bool) void.html => true,else => false,};- if (parsing_html and (iframe._src.len > 0 or iframe.hasSrcdoc())) {+ if (parsing_html and (iframe.srcAttribute().len > 0 or iframe.hasSrcdoc())) {self.queueElementEvent(Factory.protoOf(iframe), .load) catch |err| {- log.err(.frame, "iframe queue load", .{ .err = err, .url = iframe._src });+ log.err(.frame, "iframe queue load", .{ .err = err, .url = iframe.srcAttribute() });};if (delays_load) {self.pendingLoadCompleted();@@ -1333,11 +1333,11 @@ fn iframeCompletedLoading(self: *Frame, iframe: *IFrame, delays_load: bool) voidblk: {const event = Event.initTrusted(comptime .wrap("load"), .{}, self.page) catch |err| {- log.err(.frame, "iframe event init", .{ .err = err, .url = iframe._src });+ log.err(.frame, "iframe event init", .{ .err = err, .url = iframe.srcAttribute() });break :blk;};self._event_manager.dispatch(iframe.asNode().asEventTarget(), event) catch |err| {- log.debug(.js, "iframe onload", .{ .err = err, .url = iframe._src });+ log.debug(.js, "iframe onload", .{ .err = err, .url = iframe.srcAttribute() });};}diff --git a/src/browser/tests/frames/src_attribute.html b/src/browser/tests/frames/src_attribute.htmlnew file mode 100644index 000000000..9cb8cc5c1--- /dev/null+++ b/src/browser/tests/frames/src_attribute.html@@ -0,0 +1,83 @@+<!DOCTYPE html>+<script src="../testing.js"></script>++<script id=reflects_set_attribute>+ {+ const f = document.createElement('iframe');+ f.setAttribute('src', 'support/page.html');+ testing.expectEqual(new URL('support/page.html', document.baseURI).href, f.src);++ f.removeAttribute('src');+ testing.expectEqual('', f.src);+ }+</script>++<script id=set_attribute_navigates type=module>+ {+ const state = await testing.async();++ const f = document.createElement('iframe');+ f.setAttribute('src', 'support/page.html');+ let loads = 0;+ f.onload = () => {+ loads += 1;+ if (loads === 1) {+ testing.expectEqual('a-page', f.contentDocument.body.textContent.trim());+ f.setAttribute('src', 'support/sub2.html');+ return;+ }+ state.resolve(f);+ };+ document.body.appendChild(f);++ await state.done((f) => {+ testing.expectEqual('sub2 div1', f.contentDocument.getElementById('div-1').textContent);+ });+ }+</script>++<script id=remove_attribute_blanks type=module>+ {+ const state = await testing.async();++ const f = document.createElement('iframe');+ f.src = 'support/page.html';+ let loads = 0;+ f.onload = () => {+ loads += 1;+ if (loads === 1) {+ f.removeAttribute('src');+ return;+ }+ state.resolve(f);+ };+ document.body.appendChild(f);++ await state.done((f) => {+ testing.expectEqual('about:blank', f.contentWindow.location.href);+ });+ }+</script>++<script id=same_src_reloads type=module>+ {+ const state = await testing.async();++ const f = document.createElement('iframe');+ f.src = 'support/page.html';+ let loads = 0;+ f.onload = () => {+ loads += 1;+ if (loads === 1) {+ f.src = f.src;+ return;+ }+ state.resolve(loads);+ };+ document.body.appendChild(f);++ await state.done((loads) => {+ testing.expectEqual(2, loads);+ });+ }+</script>diff --git a/src/browser/webapi/element/html/IFrame.zig b/src/browser/webapi/element/html/IFrame.zigindex 4333dc8bc..10f53e26e 100644--- a/src/browser/webapi/element/html/IFrame.zig+++ b/src/browser/webapi/element/html/IFrame.zig@@ -36,7 +36,6 @@ const IFrame = @This();pub const Proto = HtmlElement;_proto_canary: if (lp.IS_DEBUG) *HtmlElement else void = undefined,-_src: []const u8 = "",_executed: bool = false,_window: ?*Window = null,@@ -63,21 +62,18 @@ pub fn isLazyLoading(self: *IFrame) bool {return std.ascii.eqlIgnoreCase(loading, "lazy");}+pub fn srcAttribute(self: *IFrame) []const u8 {+ return self.asElement().getAttributeInterned("src") orelse "";+}+pub fn getSrc(self: *IFrame, frame: *Frame) ![]const u8 {- if (self._src.len == 0) return "";- return self.asNode().resolveURLReflect(self._src, frame, .{});+ const src = self.srcAttribute();+ if (src.len == 0) return "";+ return self.asNode().resolveURLReflect(src, frame, .{});}fn setSrc(self: *IFrame, src: []const u8, frame: *Frame) !void {- const element = self.asElement();- try element.setAttributeSafe(comptime .wrap("src"), .wrap(src), frame);- self._src = element.getAttributeInterned("src") orelse unreachable;- if (element.asNode().isConnected()) {- // unlike script, an iframe is reloaded every time the src is set- // even if it's set to the same URL.- self._executed = false;- try frame.iframeAddedCallback(self);- }+ try self.asElement().setAttributeSafe(comptime .wrap("src"), .wrap(src), frame);}pub fn hasSrcdoc(self: *IFrame) bool {@@ -145,33 +141,26 @@ pub const JsApi = struct {};pub const Build = struct {- pub fn complete(node: *Node, _: *Frame) !void {- const self = node.as(IFrame);- const element = self.asElement();- self._src = element.getAttributeInterned("src") orelse "";- }-+ /// Setting src or srcdoc reloads the frame even if the value didn't+ /// change; src is ignored while srcdoc is present.pub fn attributeChange(element: *Element, name: String, _: String, frame: *Frame) !void {- if (!name.eql(comptime .wrap("srcdoc"))) {- return;- }- if (element.asNode().isConnected()) {- // like src, setting srcdoc reloads the frame even if the value didn't change- const self = element.as(IFrame);- self._executed = false;- try frame.iframeAddedCallback(self);- }+ if (reprocesses(element, name)) try reload(element, frame);}+ /// Removing srcdoc falls back to src, removing src to about:blank.pub fn attributeRemove(element: *Element, name: String, frame: *Frame) !void {- if (!name.eql(comptime .wrap("srcdoc"))) {- return;- }- if (element.asNode().isConnected()) {- const self = element.as(IFrame);- // removing srcdoc falls back to src (or about:blank)- self._executed = false;- try frame.iframeAddedCallback(self);- }+ if (reprocesses(element, name)) try reload(element, frame);+ }++ fn reprocesses(element: *Element, name: String) bool {+ if (name.eql(comptime .wrap("srcdoc"))) return true;+ return name.eql(comptime .wrap("src")) and !element.as(IFrame).hasSrcdoc();+ }++ fn reload(element: *Element, frame: *Frame) !void {+ if (!element.asNode().isConnected()) return;+ const self = element.as(IFrame);+ self._executed = false;+ try frame.iframeAddedCallback(self);}};