diff --git a/Userland/Libraries/LibWeb/CSS/Screen.cpp b/Userland/Libraries/LibWeb/CSS/Screen.cpp index 9632405564..09ddfa1bb3 100644 --- a/Userland/Libraries/LibWeb/CSS/Screen.cpp +++ b/Userland/Libraries/LibWeb/CSS/Screen.cpp @@ -19,7 +19,7 @@ Screen::Screen(DOM::Window& window) Gfx::IntRect Screen::screen_rect() const { - return m_window.document().page()->screen_rect(); + return m_window.page()->screen_rect(); } } diff --git a/Userland/Libraries/LibWeb/DOM/Window.cpp b/Userland/Libraries/LibWeb/DOM/Window.cpp index 65492f6c0e..e3d54f8092 100644 --- a/Userland/Libraries/LibWeb/DOM/Window.cpp +++ b/Userland/Libraries/LibWeb/DOM/Window.cpp @@ -42,20 +42,20 @@ void Window::set_wrapper(Badge, Bindings::WindowObject& void Window::alert(const String& message) { - if (auto* page = m_document.page()) + if (auto* page = this->page()) page->client().page_did_request_alert(message); } bool Window::confirm(const String& message) { - if (auto* page = m_document.page()) + if (auto* page = this->page()) return page->client().page_did_request_confirm(message); return false; } String Window::prompt(const String& message, const String& default_) { - if (auto* page = m_document.page()) + if (auto* page = this->page()) return page->client().page_did_request_prompt(message, default_); return {}; } @@ -177,4 +177,14 @@ int Window::inner_height() const return document().layout_node()->height(); } +Page* Window::page() +{ + return document().page(); +} + +Page const* Window::page() const +{ + return document().page(); +} + } diff --git a/Userland/Libraries/LibWeb/DOM/Window.h b/Userland/Libraries/LibWeb/DOM/Window.h index ca3095b416..1645deb26a 100644 --- a/Userland/Libraries/LibWeb/DOM/Window.h +++ b/Userland/Libraries/LibWeb/DOM/Window.h @@ -33,6 +33,9 @@ public: virtual bool dispatch_event(NonnullRefPtr) override; virtual JS::Object* create_wrapper(JS::GlobalObject&) override; + Page* page(); + Page const* page() const; + const Document& document() const { return m_document; } Document& document() { return m_document; } diff --git a/Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp b/Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp index 93990923b4..021e988002 100644 --- a/Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp +++ b/Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp @@ -182,7 +182,7 @@ DOM::ExceptionOr XMLHttpRequest::send() return {}; } - auto request = LoadRequest::create_for_url_on_page(request_url, m_window->document().page()); + auto request = LoadRequest::create_for_url_on_page(request_url, m_window->page()); request.set_method(m_method); for (auto& it : m_request_headers) request.set_header(it.key, it.value);