1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 12:57:34 +00:00

LibWeb: Add DOMRectReadOnly and make DOMRect inherit from it

This matches the class hierarchy of the CSS Geometry Interfaces Module.
This commit is contained in:
Andreas Kling 2021-10-08 22:59:15 +02:00
parent 77f72c7cfe
commit 3c0b55c284
7 changed files with 87 additions and 24 deletions

View file

@ -6,18 +6,13 @@
#pragma once
#include <AK/RefCounted.h>
#include <LibGfx/Rect.h>
#include <LibWeb/Bindings/Wrappable.h>
#include <LibWeb/Forward.h>
#include <LibWeb/Geometry/DOMRectReadOnly.h>
namespace Web::Geometry {
// FIXME: Split this into DOMRectReadOnly and DOMRect
// https://drafts.fxtf.org/geometry/#DOMRect
class DOMRect final
: public RefCounted<DOMRect>
, public Bindings::Wrappable {
: public DOMRectReadOnly {
public:
using WrapperType = Bindings::DOMRectWrapper;
@ -41,17 +36,15 @@ public:
double width() const { return m_rect.width(); }
double height() const { return m_rect.height(); }
double top() const { return min(y(), y() + height()); }
double right() const { return max(x(), x() + width()); }
double bottom() const { return max(y(), y() + height()); }
double left() const { return min(x(), x() + width()); }
void set_x(double x) { m_rect.set_x(x); }
void set_y(double y) { m_rect.set_y(y); }
void set_width(double width) { m_rect.set_width(width); }
void set_height(double height) { m_rect.set_height(height); }
private:
DOMRect(float x, float y, float width, float height)
: m_rect(x, y, width, height)
: DOMRectReadOnly(x, y, width, height)
{
}
Gfx::FloatRect m_rect;
};
}

View file

@ -1,15 +1,10 @@
interface DOMRect {
interface DOMRect : DOMRectReadOnly {
constructor(optional double x = 0, optional double y = 0, optional double width = 0, optional double height = 0);
readonly attribute double x;
readonly attribute double y;
readonly attribute double width;
readonly attribute double height;
readonly attribute double top;
readonly attribute double right;
readonly attribute double bottom;
readonly attribute double left;
attribute double x;
attribute double y;
attribute double width;
attribute double height;
};

View file

@ -0,0 +1,51 @@
/*
* Copyright (c) 2021, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/RefCounted.h>
#include <LibGfx/Rect.h>
#include <LibWeb/Bindings/Wrappable.h>
#include <LibWeb/Forward.h>
namespace Web::Geometry {
// https://drafts.fxtf.org/geometry/#domrectreadonly
class DOMRectReadOnly
: public RefCounted<DOMRectReadOnly>
, public Bindings::Wrappable {
public:
using WrapperType = Bindings::DOMRectReadOnlyWrapper;
static NonnullRefPtr<DOMRectReadOnly> create_with_global_object(Bindings::WindowObject&, double x = 0, double y = 0, double width = 0, double height = 0)
{
return DOMRectReadOnly::create(x, y, width, height);
}
static NonnullRefPtr<DOMRectReadOnly> create(double x = 0, double y = 0, double width = 0, double height = 0)
{
return adopt_ref(*new DOMRectReadOnly(x, y, width, height));
}
double x() const { return m_rect.x(); }
double y() const { return m_rect.y(); }
double width() const { return m_rect.width(); }
double height() const { return m_rect.height(); }
double top() const { return min(y(), y() + height()); }
double right() const { return max(x(), x() + width()); }
double bottom() const { return max(y(), y() + height()); }
double left() const { return min(x(), x() + width()); }
protected:
DOMRectReadOnly(float x, float y, float width, float height)
: m_rect(x, y, width, height)
{
}
Gfx::FloatRect m_rect;
};
}

View file

@ -0,0 +1,15 @@
interface DOMRectReadOnly {
constructor(optional double x = 0, optional double y = 0, optional double width = 0, optional double height = 0);
readonly attribute double x;
readonly attribute double y;
readonly attribute double width;
readonly attribute double height;
readonly attribute double top;
readonly attribute double right;
readonly attribute double bottom;
readonly attribute double left;
};