Skip to content

Lightpanda: the headless browser designed for AI and automation

refactor(viewport): source hardcoded 1920x1080 from MediaQuery.Viewport.default

Rohit331aa6a71a70
diff --git a/src/browser/webapi/IntersectionObserver.zig b/src/browser/webapi/IntersectionObserver.zig
index b2e10843c..3ad97696f 100644
--- a/src/browser/webapi/IntersectionObserver.zig
+++ b/src/browser/webapi/IntersectionObserver.zig
@@ -22,6 +22,7 @@ const js = @import("../js/js.zig");
const Page = @import("../Page.zig");
const Frame = @import("../Frame.zig");
+const MediaQuery = @import("../css/MediaQuery.zig");
const Node = @import("Node.zig");
const Element = @import("Element.zig");
@@ -208,12 +209,12 @@ fn calculateIntersection(
const root_rect = if (self._root) |root|
root.getBoundingClientRect(frame)
else
- // Simplified viewport - assume 1920x1080 for now
+ // Simplified viewport sourced from the single MediaQuery.Viewport.default.
DOMRect{
._x = 0.0,
._y = 0.0,
- ._width = 1920.0,
- ._height = 1080.0,
+ ._width = @floatFromInt(MediaQuery.Viewport.default.width),
+ ._height = @floatFromInt(MediaQuery.Viewport.default.height),
};
// For a headless browser without real layout, we treat all elements as fully visible.
diff --git a/src/browser/webapi/Screen.zig b/src/browser/webapi/Screen.zig
index 41f462337..e912a8285 100644
--- a/src/browser/webapi/Screen.zig
+++ b/src/browser/webapi/Screen.zig
@@ -18,6 +18,7 @@
const js = @import("../js/js.zig");
const Frame = @import("../Frame.zig");
+const MediaQuery = @import("../css/MediaQuery.zig");
const EventTarget = @import("EventTarget.zig");
pub fn registerTypes() []const type {
@@ -54,9 +55,9 @@ pub const JsApi = struct {
pub var class_id: bridge.ClassId = undefined;
};
- pub const width = bridge.property(1920, .{ .template = false });
- pub const height = bridge.property(1080, .{ .template = false });
- pub const availWidth = bridge.property(1920, .{ .template = false });
+ pub const width = bridge.property(MediaQuery.Viewport.default.width, .{ .template = false });
+ pub const height = bridge.property(MediaQuery.Viewport.default.height, .{ .template = false });
+ pub const availWidth = bridge.property(MediaQuery.Viewport.default.width, .{ .template = false });
pub const availHeight = bridge.property(1040, .{ .template = false });
pub const colorDepth = bridge.property(24, .{ .template = false });
pub const pixelDepth = bridge.property(24, .{ .template = false });
diff --git a/src/browser/webapi/VisualViewport.zig b/src/browser/webapi/VisualViewport.zig
index 00cf45442..f2f56c4df 100644
--- a/src/browser/webapi/VisualViewport.zig
+++ b/src/browser/webapi/VisualViewport.zig
@@ -18,6 +18,7 @@
const js = @import("../js/js.zig");
const Frame = @import("../Frame.zig");
+const MediaQuery = @import("../css/MediaQuery.zig");
const EventTarget = @import("EventTarget.zig");
const VisualViewport = @This();
@@ -51,7 +52,7 @@ pub const JsApi = struct {
pub const offsetTop = bridge.property(0, .{ .template = false });
pub const pageLeft = bridge.accessor(VisualViewport.getPageLeft, null, .{});
pub const pageTop = bridge.accessor(VisualViewport.getPageTop, null, .{});
- pub const width = bridge.property(1920, .{ .template = false });
- pub const height = bridge.property(1080, .{ .template = false });
+ pub const width = bridge.property(MediaQuery.Viewport.default.width, .{ .template = false });
+ pub const height = bridge.property(MediaQuery.Viewport.default.height, .{ .template = false });
pub const scale = bridge.property(1.0, .{ .template = false });
};
diff --git a/src/browser/webapi/Window.zig b/src/browser/webapi/Window.zig
index 9071d3130..4726c8b6b 100644
--- a/src/browser/webapi/Window.zig
+++ b/src/browser/webapi/Window.zig
@@ -23,6 +23,7 @@ const builtin = @import("builtin");
const js = @import("../js/js.zig");
const URL = @import("../URL.zig");
const Frame = @import("../Frame.zig");
+const MediaQuery = @import("../css/MediaQuery.zig");
const Console = @import("Console.zig");
const History = @import("History.zig");
const Navigation = @import("navigation/Navigation.zig");
@@ -56,7 +57,9 @@ const IS_DEBUG = builtin.mode == .Debug;
// Faux-layout viewport height. Exposed as window.innerHeight and used to decide
// whether an element is already within view (e.g. scrollIntoViewIfNeeded).
-const DEFAULT_INNER_HEIGHT: u32 = 1080;
+// Sourced from the single MediaQuery.Viewport.default so the cascade,
+// matchMedia and the window/screen dimensions stay in sync.
+const DEFAULT_INNER_HEIGHT: u32 = MediaQuery.Viewport.default.height;
const Allocator = std.mem.Allocator;
const Execution = js.Execution;
@@ -1010,8 +1013,8 @@ pub const JsApi = struct {
pub const isSecureContext = bridge.property(false, .{ .template = false });
// [Replaceable] (CSSOM-View): writable so assignment overwrites rather than throws.
- pub const innerWidth = bridge.property(1920, .{ .template = false, .readonly = false });
- pub const innerHeight = bridge.property(DEFAULT_INNER_HEIGHT, .{ .template = false, .readonly = false });
+ pub const innerWidth = bridge.property(MediaQuery.Viewport.default.width, .{ .template = false, .readonly = false });
+ pub const innerHeight = bridge.property(MediaQuery.Viewport.default.height, .{ .template = false, .readonly = false });
pub const devicePixelRatio = bridge.property(1, .{ .template = false, .readonly = false });
pub const opener = bridge.accessor(Window.getOpener, null, .{});
diff --git a/src/cdp/domains/page.zig b/src/cdp/domains/page.zig
index ec8ad40a8..9201050ec 100644
--- a/src/cdp/domains/page.zig
+++ b/src/cdp/domains/page.zig
@@ -29,6 +29,7 @@ const CDP = @import("../CDP.zig");
const js = @import("../../browser/js/js.zig");
const URL = @import("../../browser/URL.zig");
const Frame = @import("../../browser/Frame.zig");
+const MediaQuery = @import("../../browser/css/MediaQuery.zig");
const timestampF = @import("../../datetime.zig").timestamp;
const Notification = @import("../../Notification.zig");
@@ -906,8 +907,8 @@ fn printToPDF(cmd: *CDP.Command) !void {
}
fn getLayoutMetrics(cmd: *CDP.Command) !void {
- const width = 1920;
- const height = 1080;
+ const width = MediaQuery.Viewport.default.width;
+ const height = MediaQuery.Viewport.default.height;
return cmd.sendResult(.{
.layoutViewport = .{