mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
This is the last big change necessary to create the `constellation_traits` crate. This moves the data structure for messages that originate from the `ScriptThread` and are sent to the `Contellation` to `constellation_traits`, effectively splitting `script_traits` in half. Before, `script_traits` was responsible for exposing the API of both the `ScriptThread` and the `Constellation` to the rest of Servo. - Data structures that are used by `ScriptToConstellationMsg` are moved to `constellation_traits`. The dependency graph looks a bit like this: `script_layout_interface` depends on `script_traits` depends on `constellation_traits` depends on `embedder_traits`. - Data structures that are used in the embedding layer (`UntrustedNodeAddress`, `CompositorHitTestResult`, `TouchEventResult` and `AnimationState`) are moved to embedder_traits, to avoid a dependency cycle between `webrender_traits` and `constellation_traits`. - Types dealing with MessagePorts and serialization are moved to `constellation_traits::message_port`. Testing: This is covered by existing tests as it just moves types around. Signed-off-by: Martin Robinson <mrobinson@igalia.com> Signed-off-by: Martin Robinson <mrobinson@igalia.com>
178 lines
5 KiB
Rust
178 lines
5 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
|
|
use std::collections::HashMap;
|
|
|
|
use base::id::DomPointId;
|
|
use constellation_traits::DomPoint;
|
|
use dom_struct::dom_struct;
|
|
use js::rust::HandleObject;
|
|
|
|
use crate::dom::bindings::codegen::Bindings::DOMPointBinding::{DOMPointInit, DOMPointMethods};
|
|
use crate::dom::bindings::codegen::Bindings::DOMPointReadOnlyBinding::DOMPointReadOnlyMethods;
|
|
use crate::dom::bindings::error::Fallible;
|
|
use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
|
|
use crate::dom::bindings::root::DomRoot;
|
|
use crate::dom::bindings::serializable::{Serializable, StorageKey};
|
|
use crate::dom::bindings::structuredclone::{StructuredData, StructuredDataReader};
|
|
use crate::dom::dompointreadonly::{DOMPointReadOnly, DOMPointWriteMethods};
|
|
use crate::dom::globalscope::GlobalScope;
|
|
use crate::script_runtime::CanGc;
|
|
|
|
// http://dev.w3.org/fxtf/geometry/Overview.html#dompoint
|
|
#[dom_struct]
|
|
pub(crate) struct DOMPoint {
|
|
point: DOMPointReadOnly,
|
|
}
|
|
|
|
#[allow(non_snake_case)]
|
|
impl DOMPoint {
|
|
fn new_inherited(x: f64, y: f64, z: f64, w: f64) -> DOMPoint {
|
|
DOMPoint {
|
|
point: DOMPointReadOnly::new_inherited(x, y, z, w),
|
|
}
|
|
}
|
|
|
|
pub(crate) fn new(
|
|
global: &GlobalScope,
|
|
x: f64,
|
|
y: f64,
|
|
z: f64,
|
|
w: f64,
|
|
can_gc: CanGc,
|
|
) -> DomRoot<DOMPoint> {
|
|
Self::new_with_proto(global, None, x, y, z, w, can_gc)
|
|
}
|
|
|
|
fn new_with_proto(
|
|
global: &GlobalScope,
|
|
proto: Option<HandleObject>,
|
|
x: f64,
|
|
y: f64,
|
|
z: f64,
|
|
w: f64,
|
|
can_gc: CanGc,
|
|
) -> DomRoot<DOMPoint> {
|
|
reflect_dom_object_with_proto(
|
|
Box::new(DOMPoint::new_inherited(x, y, z, w)),
|
|
global,
|
|
proto,
|
|
can_gc,
|
|
)
|
|
}
|
|
|
|
pub(crate) fn new_from_init(
|
|
global: &GlobalScope,
|
|
p: &DOMPointInit,
|
|
can_gc: CanGc,
|
|
) -> DomRoot<DOMPoint> {
|
|
DOMPoint::new(global, p.x, p.y, p.z, p.w, can_gc)
|
|
}
|
|
}
|
|
|
|
impl DOMPointMethods<crate::DomTypeHolder> for DOMPoint {
|
|
// https://drafts.fxtf.org/geometry/#dom-dompointreadonly-dompointreadonly
|
|
fn Constructor(
|
|
global: &GlobalScope,
|
|
proto: Option<HandleObject>,
|
|
can_gc: CanGc,
|
|
x: f64,
|
|
y: f64,
|
|
z: f64,
|
|
w: f64,
|
|
) -> Fallible<DomRoot<DOMPoint>> {
|
|
Ok(DOMPoint::new_with_proto(global, proto, x, y, z, w, can_gc))
|
|
}
|
|
|
|
// https://drafts.fxtf.org/geometry/#dom-dompoint-frompoint
|
|
fn FromPoint(global: &GlobalScope, init: &DOMPointInit, can_gc: CanGc) -> DomRoot<Self> {
|
|
Self::new_from_init(global, init, can_gc)
|
|
}
|
|
|
|
// https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-x
|
|
fn X(&self) -> f64 {
|
|
self.point.X()
|
|
}
|
|
|
|
// https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-x
|
|
fn SetX(&self, value: f64) {
|
|
self.point.SetX(value);
|
|
}
|
|
|
|
// https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-y
|
|
fn Y(&self) -> f64 {
|
|
self.point.Y()
|
|
}
|
|
|
|
// https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-y
|
|
fn SetY(&self, value: f64) {
|
|
self.point.SetY(value);
|
|
}
|
|
|
|
// https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-z
|
|
fn Z(&self) -> f64 {
|
|
self.point.Z()
|
|
}
|
|
|
|
// https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-z
|
|
fn SetZ(&self, value: f64) {
|
|
self.point.SetZ(value);
|
|
}
|
|
|
|
// https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-w
|
|
fn W(&self) -> f64 {
|
|
self.point.W()
|
|
}
|
|
|
|
// https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-w
|
|
fn SetW(&self, value: f64) {
|
|
self.point.SetW(value);
|
|
}
|
|
}
|
|
|
|
impl Serializable for DOMPoint {
|
|
type Id = DomPointId;
|
|
type Data = DomPoint;
|
|
|
|
fn serialize(&self) -> Result<(Self::Id, Self::Data), ()> {
|
|
let serialized = DomPoint {
|
|
x: self.X(),
|
|
y: self.Y(),
|
|
z: self.Z(),
|
|
w: self.W(),
|
|
};
|
|
Ok((DomPointId::new(), serialized))
|
|
}
|
|
|
|
fn deserialize(
|
|
owner: &GlobalScope,
|
|
serialized: Self::Data,
|
|
can_gc: CanGc,
|
|
) -> Result<DomRoot<Self>, ()>
|
|
where
|
|
Self: Sized,
|
|
{
|
|
Ok(Self::new(
|
|
owner,
|
|
serialized.x,
|
|
serialized.y,
|
|
serialized.z,
|
|
serialized.w,
|
|
can_gc,
|
|
))
|
|
}
|
|
|
|
fn serialized_storage(data: StructuredData<'_>) -> &mut Option<HashMap<Self::Id, Self::Data>> {
|
|
match data {
|
|
StructuredData::Reader(reader) => &mut reader.points,
|
|
StructuredData::Writer(writer) => &mut writer.points,
|
|
}
|
|
}
|
|
|
|
fn deserialized_storage(
|
|
reader: &mut StructuredDataReader,
|
|
) -> &mut Option<HashMap<StorageKey, DomRoot<Self>>> {
|
|
&mut reader.dom_points
|
|
}
|
|
}
|