diff --git a/components/script/dom/mouseevent.rs b/components/script/dom/mouseevent.rs index 9b184a96da6..fc0f777ecd5 100644 --- a/components/script/dom/mouseevent.rs +++ b/components/script/dom/mouseevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::MouseEventBinding::MouseEventMethod use crate::dom::bindings::codegen::Bindings::UIEventBinding::UIEventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object; +use crate::dom::bindings::reflector::{reflect_dom_object, DomObject}; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; use crate::dom::bindings::str::DOMString; use crate::dom::event::{Event, EventBubbles, EventCancelable}; @@ -27,6 +27,8 @@ pub struct MouseEvent { screen_y: Cell, client_x: Cell, client_y: Cell, + page_x: Cell, + page_y: Cell, ctrl_key: Cell, shift_key: Cell, alt_key: Cell, @@ -45,6 +47,8 @@ impl MouseEvent { screen_y: Cell::new(0), client_x: Cell::new(0), client_y: Cell::new(0), + page_x: Cell::new(0), + page_y: Cell::new(0), ctrl_key: Cell::new(false), shift_key: Cell::new(false), alt_key: Cell::new(false), @@ -104,6 +108,9 @@ impl MouseEvent { ); ev.buttons.set(buttons); ev.point_in_target.set(point_in_target); + // TODO: Set proper values in https://github.com/servo/servo/issues/24415 + ev.page_x.set(client_x); + ev.page_y.set(client_y); ev } @@ -163,6 +170,28 @@ impl MouseEventMethods for MouseEvent { self.client_y.get() } + // https://drafts.csswg.org/cssom-view/#dom-mouseevent-pagex + fn PageX(&self) -> i32 { + if self.upcast::().dispatching() { + self.page_x.get() + } else { + let global = self.global(); + let window = global.as_window(); + window.current_viewport().origin.x.to_px() + self.client_x.get() + } + } + + // https://drafts.csswg.org/cssom-view/#dom-mouseevent-pagey + fn PageY(&self) -> i32 { + if self.upcast::().dispatching() { + self.page_y.get() + } else { + let global = self.global(); + let window = global.as_window(); + window.current_viewport().origin.y.to_px() + self.client_y.get() + } + } + // https://w3c.github.io/uievents/#widl-MouseEvent-ctrlKey fn CtrlKey(&self) -> bool { self.ctrl_key.get() diff --git a/components/script/dom/webidls/MouseEvent.webidl b/components/script/dom/webidls/MouseEvent.webidl index 9a36e69cafe..253463e7eae 100644 --- a/components/script/dom/webidls/MouseEvent.webidl +++ b/components/script/dom/webidls/MouseEvent.webidl @@ -10,6 +10,8 @@ interface MouseEvent : UIEvent { readonly attribute long screenY; readonly attribute long clientX; readonly attribute long clientY; + readonly attribute long pageX; + readonly attribute long pageY; readonly attribute boolean ctrlKey; readonly attribute boolean shiftKey; readonly attribute boolean altKey; diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index a385028f3e6..b9ae42c6c72 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -613547,7 +613547,7 @@ "testharness" ], "css/cssom-view/mouseEvent.html": [ - "907a2b405e442ba09ae623327d6f7de5492d3a80", + "7e194b8909317806ff80e300cd480b31680a397e", "testharness" ], "css/cssom-view/negativeMargins.html": [ diff --git a/tests/wpt/metadata/css/cssom-view/idlharness.html.ini b/tests/wpt/metadata/css/cssom-view/idlharness.html.ini index 65edc5a8f23..0b7ddfcc064 100644 --- a/tests/wpt/metadata/css/cssom-view/idlharness.html.ini +++ b/tests/wpt/metadata/css/cssom-view/idlharness.html.ini @@ -29,12 +29,6 @@ [Text interface: document.createTextNode("x") must inherit property "getBoxQuads(BoxQuadOptions)" with the proper type] expected: FAIL - [MouseEvent interface: attribute pageX] - expected: FAIL - - [MouseEvent interface: attribute pageY] - expected: FAIL - [HTMLImageElement interface: document.createElement("img") must inherit property "x" with the proper type] expected: FAIL @@ -316,10 +310,3 @@ [MouseEvent interface: new MouseEvent("foo") must inherit property "offsetX" with the proper type] expected: FAIL - - [MouseEvent interface: new MouseEvent("foo") must inherit property "pageY" with the proper type] - expected: FAIL - - [MouseEvent interface: new MouseEvent("foo") must inherit property "pageX" with the proper type] - expected: FAIL - diff --git a/tests/wpt/web-platform-tests/css/cssom-view/mouseEvent.html b/tests/wpt/web-platform-tests/css/cssom-view/mouseEvent.html index 907a2b405e4..7e194b89093 100644 --- a/tests/wpt/web-platform-tests/css/cssom-view/mouseEvent.html +++ b/tests/wpt/web-platform-tests/css/cssom-view/mouseEvent.html @@ -2,6 +2,9 @@ CSSOM MouseEvent tests +
+ Hello +