RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 19:37:36 +00:00
Code Issues Activity Actions

LibWeb: Use prototype and constructor methods from new Intrinsics

Browse source 
This will let us remove the helpers from Window that simply defer to the
Intrinsics that are hanging off the [[HostDefined]] slot on the realm
This commit is contained in:
Andrew Kaster 2022-09-30 17:40:20 -06:00 • committed by Linus Groh
parent beb3519a49
commit f1367e0e4c
10 changed files with 19 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Libraries/LibWeb/Bindings/AudioConstructor.cpp
View file

@ -21,10 +21,9 @@ AudioConstructor::AudioConstructor(JS::Realm& realm)
void AudioConstructor::initialize(JS::Realm& realm) void AudioConstructor::initialize(JS::Realm& realm)
{ {
auto& vm = this->vm(); auto& vm = this->vm();
auto& window = verify_cast<HTML::Window>(realm.global_object());
NativeFunction::initialize(realm); NativeFunction::initialize(realm);
define_direct_property(vm.names.prototype, &window.cached_web_prototype("HTMLAudioElement"), 0); define_direct_property(vm.names.prototype, &cached_web_prototype(realm, "HTMLAudioElement"), 0);
define_direct_property(vm.names.length, JS::Value(0), JS::Attribute::Configurable); define_direct_property(vm.names.length, JS::Value(0), JS::Attribute::Configurable);
} }

5
Userland/Libraries/LibWeb/Bindings/ImageConstructor.cpp
View file

@ -21,10 +21,9 @@ ImageConstructor::ImageConstructor(JS::Realm& realm)
void ImageConstructor::initialize(JS::Realm& realm) void ImageConstructor::initialize(JS::Realm& realm)
{ {
auto& vm = this->vm(); auto& vm = this->vm();
auto& window = verify_cast<HTML::Window>(realm.global_object());
NativeFunction::initialize(realm);
define_direct_property(vm.names.prototype, &window.cached_web_prototype("HTMLImageElement"), 0); NativeFunction::initialize(realm);
define_direct_property(vm.names.prototype, &cached_web_prototype(realm, "HTMLImageElement"), 0);
define_direct_property(vm.names.length, JS::Value(0), JS::Attribute::Configurable); define_direct_property(vm.names.length, JS::Value(0), JS::Attribute::Configurable);
} }

6
Userland/Libraries/LibWeb/Bindings/LocationConstructor.cpp
View file

@ -4,10 +4,9 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibJS/Runtime/GlobalObject.h> #include <LibWeb/Bindings/Intrinsics.h>
#include <LibWeb/Bindings/LocationConstructor.h> #include <LibWeb/Bindings/LocationConstructor.h>
#include <LibWeb/Bindings/LocationPrototype.h> #include <LibWeb/Bindings/LocationPrototype.h>
#include <LibWeb/HTML/Window.h>
namespace Web::Bindings { namespace Web::Bindings {
@ -31,10 +30,9 @@ JS::ThrowCompletionOr<JS::Object*> LocationConstructor::construct(FunctionObject
void LocationConstructor::initialize(JS::Realm& realm) void LocationConstructor::initialize(JS::Realm& realm)
{ {
auto& vm = this->vm(); auto& vm = this->vm();
auto& window = verify_cast<HTML::Window>(realm.global_object());
NativeFunction::initialize(realm); NativeFunction::initialize(realm);
define_direct_property(vm.names.prototype, &window.cached_web_prototype("Location"), 0); define_direct_property(vm.names.prototype, &cached_web_prototype(realm, "Location"), 0);
define_direct_property(vm.names.length, JS::Value(0), JS::Attribute::Configurable); define_direct_property(vm.names.length, JS::Value(0), JS::Attribute::Configurable);
} }

6
Userland/Libraries/LibWeb/Bindings/LocationObject.cpp
View file

@ -24,7 +24,7 @@ namespace Web::Bindings {
LocationObject::LocationObject(JS::Realm& realm) LocationObject::LocationObject(JS::Realm& realm)
: PlatformObject(realm) : PlatformObject(realm)
{ {
set_prototype(&verify_cast<HTML::Window>(realm.global_object()).cached_web_prototype("Location")); set_prototype(&cached_web_prototype(realm, "Location"));
} }
LocationObject::~LocationObject() = default; LocationObject::~LocationObject() = default;
@ -315,7 +315,7 @@ JS::ThrowCompletionOr<bool> LocationObject::internal_define_own_property(JS::Pro
} }
// 2. Throw a "SecurityError" DOMException. // 2. Throw a "SecurityError" DOMException.
return throw_completion(WebIDL::SecurityError::create(global_object(), String::formatted("Can't define property '{}' on cross-origin object", property_key))); return throw_completion(WebIDL::SecurityError::create(realm(), String::formatted("Can't define property '{}' on cross-origin object", property_key)));
} }
// 7.10.5.7 [[Get]] ( P, Receiver ), https://html.spec.whatwg.org/multipage/history.html#location-get // 7.10.5.7 [[Get]] ( P, Receiver ), https://html.spec.whatwg.org/multipage/history.html#location-get
@ -352,7 +352,7 @@ JS::ThrowCompletionOr<bool> LocationObject::internal_delete(JS::PropertyKey cons
return JS::Object::internal_delete(property_key); return JS::Object::internal_delete(property_key);
// 2. Throw a "SecurityError" DOMException. // 2. Throw a "SecurityError" DOMException.
return throw_completion(WebIDL::SecurityError::create(global_object(), String::formatted("Can't delete property '{}' on cross-origin object", property_key))); return throw_completion(WebIDL::SecurityError::create(realm(), String::formatted("Can't delete property '{}' on cross-origin object", property_key)));
} }
// 7.10.5.10 [[OwnPropertyKeys]] ( ), https://html.spec.whatwg.org/multipage/history.html#location-ownpropertykeys // 7.10.5.10 [[OwnPropertyKeys]] ( ), https://html.spec.whatwg.org/multipage/history.html#location-ownpropertykeys

6
Userland/Libraries/LibWeb/Bindings/NavigatorConstructor.cpp
View file

@ -4,10 +4,9 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibJS/Runtime/GlobalObject.h> #include <LibWeb/Bindings/Intrinsics.h>
#include <LibWeb/Bindings/NavigatorConstructor.h> #include <LibWeb/Bindings/NavigatorConstructor.h>
#include <LibWeb/Bindings/NavigatorPrototype.h> #include <LibWeb/Bindings/NavigatorPrototype.h>
#include <LibWeb/HTML/Window.h>
namespace Web::Bindings { namespace Web::Bindings {
@ -31,10 +30,9 @@ JS::ThrowCompletionOr<JS::Object*> NavigatorConstructor::construct(FunctionObjec
void NavigatorConstructor::initialize(JS::Realm& realm) void NavigatorConstructor::initialize(JS::Realm& realm)
{ {
auto& vm = this->vm(); auto& vm = this->vm();
auto& window = verify_cast<HTML::Window>(realm.global_object());
NativeFunction::initialize(realm); NativeFunction::initialize(realm);
define_direct_property(vm.names.prototype, &window.cached_web_prototype("Navigator"), 0); define_direct_property(vm.names.prototype, &cached_web_prototype(realm, "Navigator"), 0);
define_direct_property(vm.names.length, JS::Value(0), JS::Attribute::Configurable); define_direct_property(vm.names.length, JS::Value(0), JS::Attribute::Configurable);
} }

4
Userland/Libraries/LibWeb/Bindings/NavigatorObject.cpp
View file

@ -5,7 +5,7 @@
*/ */
#include <LibJS/Runtime/Array.h> #include <LibJS/Runtime/Array.h>
#include <LibJS/Runtime/GlobalObject.h> #include <LibWeb/Bindings/Intrinsics.h>
#include <LibWeb/Bindings/NavigatorObject.h> #include <LibWeb/Bindings/NavigatorObject.h>
#include <LibWeb/Bindings/NavigatorPrototype.h> #include <LibWeb/Bindings/NavigatorPrototype.h>
#include <LibWeb/Loader/ResourceLoader.h> #include <LibWeb/Loader/ResourceLoader.h>
@ -14,7 +14,7 @@ namespace Web {
namespace Bindings { namespace Bindings {
NavigatorObject::NavigatorObject(JS::Realm& realm) NavigatorObject::NavigatorObject(JS::Realm& realm)
: Object(verify_cast<HTML::Window>(realm.global_object()).cached_web_prototype("Navigator")) : Object(cached_web_prototype(realm, "Navigator"))
{ {
} }

5
Userland/Libraries/LibWeb/Bindings/OptionConstructor.cpp
View file

@ -23,10 +23,9 @@ OptionConstructor::OptionConstructor(JS::Realm& realm)
void OptionConstructor::initialize(JS::Realm& realm) void OptionConstructor::initialize(JS::Realm& realm)
{ {
auto& vm = this->vm(); auto& vm = this->vm();
auto& window = verify_cast<HTML::Window>(realm.global_object());
NativeFunction::initialize(realm);
define_direct_property(vm.names.prototype, &window.cached_web_prototype("HTMLOptionElement"), 0); NativeFunction::initialize(realm);
define_direct_property(vm.names.prototype, &cached_web_prototype(realm, "HTMLOptionElement"), 0);
define_direct_property(vm.names.length, JS::Value(0), JS::Attribute::Configurable); define_direct_property(vm.names.length, JS::Value(0), JS::Attribute::Configurable);
} }

2
Userland/Libraries/LibWeb/Bindings/PlatformObject.h
View file

@ -31,7 +31,7 @@ public:
HTML::Window& global_object() const; HTML::Window& global_object() const;
protected: protected:
PlatformObject(JS::Realm&); explicit PlatformObject(JS::Realm&);
explicit PlatformObject(JS::Object& prototype); explicit PlatformObject(JS::Object& prototype);
}; };

6
Userland/Libraries/LibWeb/Bindings/WindowConstructor.cpp
View file

@ -4,10 +4,9 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibJS/Runtime/GlobalObject.h> #include <LibWeb/Bindings/Intrinsics.h>
#include <LibWeb/Bindings/WindowConstructor.h> #include <LibWeb/Bindings/WindowConstructor.h>
#include <LibWeb/Bindings/WindowPrototype.h> #include <LibWeb/Bindings/WindowPrototype.h>
#include <LibWeb/HTML/Window.h>
namespace Web::Bindings { namespace Web::Bindings {
@ -31,10 +30,9 @@ JS::ThrowCompletionOr<JS::Object*> WindowConstructor::construct(FunctionObject&)
void WindowConstructor::initialize(JS::Realm& realm) void WindowConstructor::initialize(JS::Realm& realm)
{ {
auto& vm = this->vm(); auto& vm = this->vm();
auto& window = verify_cast<HTML::Window>(realm.global_object());
NativeFunction::initialize(realm); NativeFunction::initialize(realm);
define_direct_property(vm.names.prototype, &window.cached_web_prototype("Window"), 0); define_direct_property(vm.names.prototype, &cached_web_prototype(realm, "Window"), 0);
define_direct_property(vm.names.length, JS::Value(0), JS::Attribute::Configurable); define_direct_property(vm.names.length, JS::Value(0), JS::Attribute::Configurable);
} }

7
Userland/Libraries/LibWeb/Bindings/WindowPrototype.h
View file

@ -6,12 +6,9 @@
#pragma once #pragma once
#include <LibJS/Runtime/GlobalObject.h>
#include <LibJS/Runtime/Object.h> #include <LibJS/Runtime/Object.h>
#include <LibJS/Runtime/VM.h> #include <LibWeb/Bindings/Intrinsics.h>
#include <LibWeb/Bindings/EventTargetPrototype.h>
#include <LibWeb/Forward.h> #include <LibWeb/Forward.h>
#include <LibWeb/HTML/Window.h>
namespace Web::Bindings { namespace Web::Bindings {
@ -20,7 +17,7 @@ class WindowPrototype final : public JS::Object {
public: public:
explicit WindowPrototype(JS::Realm& realm) explicit WindowPrototype(JS::Realm& realm)
: JS::Object(verify_cast<HTML::Window>(realm.global_object()).cached_web_prototype("EventTarget")) : JS::Object(cached_web_prototype(realm, "EventTarget"))
{ {
} }
}; };