RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:57:44 +00:00
Code Issues Activity Actions

LibWeb/HTML: Port Window.history to IDL

Browse source
This commit is contained in:
Linus Groh 2023-03-05 20:21:35 +00:00
parent eccc0d90de
commit c42496187b
6 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Libraries/LibWeb/DOM/Document.cpp
View file

@ -2068,6 +2068,11 @@ JS::NonnullGCPtr<HTML::History> Document::history()
return *m_history; return *m_history;
} }
JS::NonnullGCPtr<HTML::History> Document::history() const
{
return const_cast<Document*>(this)->history();
}
// https://html.spec.whatwg.org/multipage/origin.html#dom-document-domain // https://html.spec.whatwg.org/multipage/origin.html#dom-document-domain
DeprecatedString Document::domain() const DeprecatedString Document::domain() const
{ {

2
Userland/Libraries/LibWeb/DOM/Document.h
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2018-2022, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2022, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021-2023, Linus Groh <linusg@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -337,6 +338,7 @@ public:
bool is_active() const; bool is_active() const;
JS::NonnullGCPtr<HTML::History> history(); JS::NonnullGCPtr<HTML::History> history();
JS::NonnullGCPtr<HTML::History> history() const;
HTML::Location* location(); HTML::Location* location();

1
Userland/Libraries/LibWeb/Forward.h
View file

@ -249,6 +249,7 @@ class ErrorEvent;
class EventHandler; class EventHandler;
class EventLoop; class EventLoop;
class FormDataEvent; class FormDataEvent;
class History;
class HTMLAnchorElement; class HTMLAnchorElement;
class HTMLAreaElement; class HTMLAreaElement;
class HTMLAudioElement; class HTMLAudioElement;

14
Userland/Libraries/LibWeb/HTML/Window.cpp
View file

@ -1076,7 +1076,6 @@ WebIDL::ExceptionOr<void> Window::initialize_web_interfaces(Badge<WindowEnvironm
define_native_accessor(realm, "top", top_getter, nullptr, JS::Attribute::Enumerable); define_native_accessor(realm, "top", top_getter, nullptr, JS::Attribute::Enumerable);
define_native_accessor(realm, "parent", parent_getter, {}, JS::Attribute::Enumerable); define_native_accessor(realm, "parent", parent_getter, {}, JS::Attribute::Enumerable);
define_native_accessor(realm, "frameElement", frame_element_getter, {}, JS::Attribute::Enumerable); define_native_accessor(realm, "frameElement", frame_element_getter, {}, JS::Attribute::Enumerable);
define_native_accessor(realm, "history", history_getter, {}, JS::Attribute::Enumerable);
define_native_accessor(realm, "performance", performance_getter, performance_setter, JS::Attribute::Enumerable | JS::Attribute::Configurable); define_native_accessor(realm, "performance", performance_getter, performance_setter, JS::Attribute::Enumerable | JS::Attribute::Configurable);
define_native_accessor(realm, "crypto", crypto_getter, {}, JS::Attribute::Enumerable); define_native_accessor(realm, "crypto", crypto_getter, {}, JS::Attribute::Enumerable);
define_native_accessor(realm, "screen", screen_getter, screen_setter, JS::Attribute::Enumerable | JS::Attribute::Configurable); define_native_accessor(realm, "screen", screen_getter, screen_setter, JS::Attribute::Enumerable | JS::Attribute::Configurable);
@ -1232,6 +1231,13 @@ JS::NonnullGCPtr<Location> Window::location() const
return *m_location; return *m_location;
} }
// https://html.spec.whatwg.org/multipage/nav-history-apis.html#dom-history
JS::NonnullGCPtr<History> Window::history() const
{
// The history getter steps are to return this's associated Document's history object.
return associated_document().history();
}
// https://html.spec.whatwg.org/multipage/window-object.html#dom-frames // https://html.spec.whatwg.org/multipage/window-object.html#dom-frames
JS::NonnullGCPtr<WindowProxy> Window::frames() const JS::NonnullGCPtr<WindowProxy> Window::frames() const
{ {
@ -1825,12 +1831,6 @@ JS_DEFINE_NATIVE_FUNCTION(Window::scroll_by)
return JS::js_undefined(); return JS::js_undefined();
} }
JS_DEFINE_NATIVE_FUNCTION(Window::history_getter)
{
auto* impl = TRY(impl_from(vm));
return impl->associated_document().history();
}
JS_DEFINE_NATIVE_FUNCTION(Window::screen_left_getter) JS_DEFINE_NATIVE_FUNCTION(Window::screen_left_getter)
{ {
auto* impl = TRY(impl_from(vm)); auto* impl = TRY(impl_from(vm));

3
Userland/Libraries/LibWeb/HTML/Window.h
View file

@ -143,6 +143,7 @@ public:
String name() const; String name() const;
void set_name(String const&); void set_name(String const&);
JS::NonnullGCPtr<Location> location() const; JS::NonnullGCPtr<Location> location() const;
JS::NonnullGCPtr<History> history() const;
JS::NonnullGCPtr<WindowProxy> frames() const; JS::NonnullGCPtr<WindowProxy> frames() const;
@ -226,8 +227,6 @@ private:
JS_DECLARE_NATIVE_FUNCTION(performance_getter); JS_DECLARE_NATIVE_FUNCTION(performance_getter);
JS_DECLARE_NATIVE_FUNCTION(performance_setter); JS_DECLARE_NATIVE_FUNCTION(performance_setter);
JS_DECLARE_NATIVE_FUNCTION(history_getter);
JS_DECLARE_NATIVE_FUNCTION(screen_getter); JS_DECLARE_NATIVE_FUNCTION(screen_getter);
JS_DECLARE_NATIVE_FUNCTION(screen_setter); JS_DECLARE_NATIVE_FUNCTION(screen_setter);

1
Userland/Libraries/LibWeb/HTML/Window.idl
View file

@ -12,6 +12,7 @@ interface Window : EventTarget {
[LegacyUnforgeable] readonly attribute Document document; [LegacyUnforgeable] readonly attribute Document document;
attribute DOMString name; attribute DOMString name;
[PutForwards=href, LegacyUnforgeable] readonly attribute Location location; [PutForwards=href, LegacyUnforgeable] readonly attribute Location location;
readonly attribute History history;
// other browsing contexts // other browsing contexts
[Replaceable] readonly attribute WindowProxy frames; [Replaceable] readonly attribute WindowProxy frames;