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

LibWeb: Return null in Window.{top,parent} if browsing context is null

Browse source 
We were asserting that it exists, but the spec says to return null in
this case.

Top: https://html.spec.whatwg.org/multipage/browsers.html#dom-top
Parent: https://html.spec.whatwg.org/multipage/browsers.html#dom-parent
This commit is contained in:
Luke 2021-05-31 10:10:05 +01:00 • committed by Ali Mohammad Pur
parent 5bfba3f789
commit 2ad25aa8f8
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Libraries/LibWeb/Bindings/WindowObject.cpp
View file

@ -339,25 +339,33 @@ JS_DEFINE_NATIVE_FUNCTION(WindowObject::btoa)
return JS::js_string(vm, move(encoded)); return JS::js_string(vm, move(encoded));
} }
// https://html.spec.whatwg.org/multipage/browsers.html#dom-top
JS_DEFINE_NATIVE_GETTER(WindowObject::top_getter) JS_DEFINE_NATIVE_GETTER(WindowObject::top_getter)
{ {
auto* impl = impl_from(vm, global_object); auto* impl = impl_from(vm, global_object);
if (!impl) if (!impl)
return {}; return {};
auto* this_browsing_context = impl->document().browsing_context(); auto* this_browsing_context = impl->document().browsing_context();
VERIFY(this_browsing_context); if (!this_browsing_context)
return JS::js_null();
VERIFY(this_browsing_context->top_level_browsing_context().document()); VERIFY(this_browsing_context->top_level_browsing_context().document());
auto& top_window = this_browsing_context->top_level_browsing_context().document()->window(); auto& top_window = this_browsing_context->top_level_browsing_context().document()->window();
return top_window.wrapper(); return top_window.wrapper();
} }
// https://html.spec.whatwg.org/multipage/browsers.html#dom-parent
JS_DEFINE_NATIVE_GETTER(WindowObject::parent_getter) JS_DEFINE_NATIVE_GETTER(WindowObject::parent_getter)
{ {
auto* impl = impl_from(vm, global_object); auto* impl = impl_from(vm, global_object);
if (!impl) if (!impl)
return {}; return {};
auto* this_browsing_context = impl->document().browsing_context(); auto* this_browsing_context = impl->document().browsing_context();
VERIFY(this_browsing_context); if (!this_browsing_context)
return JS::js_null();
if (this_browsing_context->parent()) { if (this_browsing_context->parent()) {
VERIFY(this_browsing_context->parent()->document()); VERIFY(this_browsing_context->parent()->document());
auto& parent_window = this_browsing_context->parent()->document()->window(); auto& parent_window = this_browsing_context->parent()->document()->window();