mirror of
https://github.com/servo/servo.git
synced 2025-08-02 20:20:14 +01:00
Auto merge of #14630 - bd339:iss14064, r=KiChjang
Use MediaQueryListEvent for media query list change events <!-- Please describe your changes on the following line: --> - Implements MediaQueryListEvent interface - Makes MediaQueryList change events conform to the [spec](https://drafts.csswg.org/cssom-view/#evaluate-media-queries-and-report-changes) - Updates matchMedia.html test to verify that the new event type is used --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #14064 <!-- Either: --> - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14630) <!-- Reviewable:end -->
This commit is contained in:
commit
bcf154d8e6
6 changed files with 120 additions and 2 deletions
|
@ -9,12 +9,15 @@ use dom::bindings::codegen::Bindings::EventTargetBinding::EventTargetMethods;
|
|||
use dom::bindings::codegen::Bindings::MediaQueryListBinding::{self, MediaQueryListMethods};
|
||||
use dom::bindings::inheritance::Castable;
|
||||
use dom::bindings::js::{JS, Root};
|
||||
use dom::bindings::reflector::DomObject;
|
||||
use dom::bindings::reflector::reflect_dom_object;
|
||||
use dom::bindings::str::DOMString;
|
||||
use dom::bindings::trace::JSTraceable;
|
||||
use dom::bindings::weakref::{WeakRef, WeakRefVec};
|
||||
use dom::document::Document;
|
||||
use dom::event::Event;
|
||||
use dom::eventtarget::EventTarget;
|
||||
use dom::mediaquerylistevent::MediaQueryListEvent;
|
||||
use euclid::scale_factor::ScaleFactor;
|
||||
use js::jsapi::JSTracer;
|
||||
use std::cell::Cell;
|
||||
|
@ -136,8 +139,14 @@ impl WeakMediaQueryListVec {
|
|||
/// https://drafts.csswg.org/cssom-view/#evaluate-media-queries-and-report-changes
|
||||
pub fn evaluate_and_report_changes(&self) {
|
||||
for mql in self.cell.borrow().iter() {
|
||||
if let MediaQueryListMatchState::Changed(_) = mql.root().unwrap().evaluate_changes() {
|
||||
mql.root().unwrap().upcast::<EventTarget>().fire_event(atom!("change"));
|
||||
let mql = mql.root().unwrap();
|
||||
if let MediaQueryListMatchState::Changed(_) = mql.evaluate_changes() {
|
||||
let event = MediaQueryListEvent::new(&mql.global(),
|
||||
atom!("change"),
|
||||
false, false,
|
||||
mql.Media(),
|
||||
mql.Matches());
|
||||
event.upcast::<Event>().fire(mql.upcast::<EventTarget>());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
82
components/script/dom/mediaquerylistevent.rs
Normal file
82
components/script/dom/mediaquerylistevent.rs
Normal file
|
@ -0,0 +1,82 @@
|
|||
/* 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 http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use dom::bindings::codegen::Bindings::EventBinding::EventMethods;
|
||||
use dom::bindings::codegen::Bindings::MediaQueryListEventBinding;
|
||||
use dom::bindings::codegen::Bindings::MediaQueryListEventBinding::MediaQueryListEventInit;
|
||||
use dom::bindings::codegen::Bindings::MediaQueryListEventBinding::MediaQueryListEventMethods;
|
||||
use dom::bindings::error::Fallible;
|
||||
use dom::bindings::inheritance::Castable;
|
||||
use dom::bindings::js::Root;
|
||||
use dom::bindings::reflector::reflect_dom_object;
|
||||
use dom::bindings::str::DOMString;
|
||||
use dom::event::Event;
|
||||
use dom::globalscope::GlobalScope;
|
||||
use dom::window::Window;
|
||||
use servo_atoms::Atom;
|
||||
use std::cell::Cell;
|
||||
|
||||
// https://drafts.csswg.org/cssom-view/#dom-mediaquerylistevent-mediaquerylistevent
|
||||
#[dom_struct]
|
||||
pub struct MediaQueryListEvent {
|
||||
event: Event,
|
||||
media: DOMString,
|
||||
matches: Cell<bool>
|
||||
}
|
||||
|
||||
impl MediaQueryListEvent {
|
||||
pub fn new_uninitialized(global: &GlobalScope) -> Root<MediaQueryListEvent> {
|
||||
MediaQueryListEvent::new_initialized(global,
|
||||
DOMString::new(),
|
||||
false)
|
||||
}
|
||||
|
||||
pub fn new_initialized(global: &GlobalScope,
|
||||
media: DOMString,
|
||||
matches: bool) -> Root<MediaQueryListEvent> {
|
||||
let ev = box MediaQueryListEvent {
|
||||
event: Event::new_inherited(),
|
||||
media: media,
|
||||
matches: Cell::new(matches)
|
||||
};
|
||||
reflect_dom_object(ev, global, MediaQueryListEventBinding::Wrap)
|
||||
}
|
||||
|
||||
pub fn new(global: &GlobalScope, type_: Atom,
|
||||
bubbles: bool, cancelable: bool,
|
||||
media: DOMString, matches: bool) -> Root<MediaQueryListEvent> {
|
||||
let ev = MediaQueryListEvent::new_initialized(global, media, matches);
|
||||
{
|
||||
let event = ev.upcast::<Event>();
|
||||
event.init_event(type_, bubbles, cancelable);
|
||||
}
|
||||
ev
|
||||
}
|
||||
|
||||
pub fn Constructor(window: &Window, type_: DOMString,
|
||||
init: &MediaQueryListEventInit)
|
||||
-> Fallible<Root<MediaQueryListEvent>> {
|
||||
let global = window.upcast::<GlobalScope>();
|
||||
Ok(MediaQueryListEvent::new(global, Atom::from(type_),
|
||||
init.parent.bubbles, init.parent.cancelable,
|
||||
init.media.clone(), init.matches))
|
||||
}
|
||||
}
|
||||
|
||||
impl MediaQueryListEventMethods for MediaQueryListEvent {
|
||||
// https://drafts.csswg.org/cssom-view/#dom-mediaquerylistevent-media
|
||||
fn Media(&self) -> DOMString {
|
||||
self.media.clone()
|
||||
}
|
||||
|
||||
// https://drafts.csswg.org/cssom-view/#dom-mediaquerylistevent-matches
|
||||
fn Matches(&self) -> bool {
|
||||
self.matches.get()
|
||||
}
|
||||
|
||||
// https://dom.spec.whatwg.org/#dom-event-istrusted
|
||||
fn IsTrusted(&self) -> bool {
|
||||
self.upcast::<Event>().IsTrusted()
|
||||
}
|
||||
}
|
|
@ -371,6 +371,7 @@ pub mod location;
|
|||
pub mod mediaerror;
|
||||
pub mod medialist;
|
||||
pub mod mediaquerylist;
|
||||
pub mod mediaquerylistevent;
|
||||
pub mod messageevent;
|
||||
pub mod mimetype;
|
||||
pub mod mimetypearray;
|
||||
|
|
15
components/script/dom/webidls/MediaQueryListEvent.webidl
Normal file
15
components/script/dom/webidls/MediaQueryListEvent.webidl
Normal file
|
@ -0,0 +1,15 @@
|
|||
/* 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 http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
// https://drafts.csswg.org/cssom-view/#dom-mediaquerylistevent-mediaquerylistevent
|
||||
[Constructor(DOMString type, optional MediaQueryListEventInit eventInitDict), Exposed=(Window)]
|
||||
interface MediaQueryListEvent : Event {
|
||||
readonly attribute DOMString media;
|
||||
readonly attribute boolean matches;
|
||||
};
|
||||
|
||||
dictionary MediaQueryListEventInit : EventInit {
|
||||
DOMString media = "";
|
||||
boolean matches = false;
|
||||
};
|
Loading…
Add table
Add a link
Reference in a new issue