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

LibWeb: Make CSS::Screen forward its ref count to DOM::Window

Browse source
This commit is contained in:
Andreas Kling 2021-12-09 15:47:48 +01:00
parent 7fc770cfac
commit c268d0fa13
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Libraries/LibWeb/CSS/Screen.cpp
View file

@ -7,19 +7,18 @@
#include <LibGfx/Rect.h> #include <LibGfx/Rect.h>
#include <LibWeb/CSS/Screen.h> #include <LibWeb/CSS/Screen.h>
#include <LibWeb/DOM/Document.h> #include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/Window.h>
#include <LibWeb/Page/Page.h> #include <LibWeb/Page/Page.h>
namespace Web::CSS { namespace Web::CSS {
Screen::Screen(DOM::Window& window) Screen::Screen(DOM::Window& window)
: m_window(window) : RefCountForwarder(window)
{ {
} }
Gfx::IntRect Screen::screen_rect() const Gfx::IntRect Screen::screen_rect() const
{ {
return m_window.page()->screen_rect(); return window().page()->screen_rect();
} }
} }

13
Userland/Libraries/LibWeb/CSS/Screen.h
View file

@ -6,22 +6,25 @@
#pragma once #pragma once
#include <AK/RefCountForwarder.h>
#include <LibGfx/Rect.h> #include <LibGfx/Rect.h>
#include <LibWeb/Bindings/Wrappable.h> #include <LibWeb/Bindings/Wrappable.h>
#include <LibWeb/DOM/Window.h>
#include <LibWeb/Forward.h> #include <LibWeb/Forward.h>
namespace Web::CSS { namespace Web::CSS {
class Screen final class Screen final
: public RefCounted<Screen> : public RefCountForwarder<DOM::Window>
, public Bindings::Wrappable { , public Bindings::Wrappable {
public: public:
using WrapperType = Bindings::ScreenWrapper; using WrapperType = Bindings::ScreenWrapper;
using AllowOwnPtr = TrueType;
static NonnullRefPtr<Screen> create(DOM::Window& window) static NonnullOwnPtr<Screen> create(Badge<DOM::Window>, DOM::Window& window)
{ {
return adopt_ref(*new Screen(window)); return adopt_own(*new Screen(window));
} }
i32 width() const { return screen_rect().width(); } i32 width() const { return screen_rect().width(); }
@ -34,9 +37,9 @@ public:
private: private:
explicit Screen(DOM::Window&); explicit Screen(DOM::Window&);
Gfx::IntRect screen_rect() const; DOM::Window const& window() const { return ref_count_target(); }
DOM::Window& m_window; Gfx::IntRect screen_rect() const;
}; };
} }

2
Userland/Libraries/LibWeb/DOM/Window.cpp
View file

@ -111,7 +111,7 @@ Window::Window(Document& document)
, m_associated_document(document) , m_associated_document(document)
, m_performance(make<HighResolutionTime::Performance>(*this)) , m_performance(make<HighResolutionTime::Performance>(*this))
, m_crypto(Crypto::Crypto::create()) , m_crypto(Crypto::Crypto::create())
, m_screen(CSS::Screen::create(*this)) , m_screen(CSS::Screen::create({}, *this))
{ {
} }

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

@ -114,7 +114,7 @@ private:
NonnullOwnPtr<HighResolutionTime::Performance> m_performance; NonnullOwnPtr<HighResolutionTime::Performance> m_performance;
NonnullRefPtr<Crypto::Crypto> m_crypto; NonnullRefPtr<Crypto::Crypto> m_crypto;
NonnullRefPtr<CSS::Screen> m_screen; NonnullOwnPtr<CSS::Screen> m_screen;
RefPtr<Event> m_current_event; RefPtr<Event> m_current_event;
HashMap<i32, NonnullRefPtr<RequestAnimationFrameCallback>> m_request_animation_frame_callbacks; HashMap<i32, NonnullRefPtr<RequestAnimationFrameCallback>> m_request_animation_frame_callbacks;