diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-11-02 14:51:12 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-02 14:51:12 -0500 |
commit | 6ef46ab9e4ec08d5f5226d41f0cac77c3584bae9 (patch) | |
tree | 1eecad9e272742998500a50421130c9131bbe4b8 /components/script/dom/bindings/trace.rs | |
parent | 021cabd3e6242b3537addec32010ee8cee556121 (diff) | |
parent | 138a0480fee8e6f0a338d85160aca49f14e245c9 (diff) | |
download | servo-6ef46ab9e4ec08d5f5226d41f0cac77c3584bae9.tar.gz servo-6ef46ab9e4ec08d5f5226d41f0cac77c3584bae9.zip |
Auto merge of #13453 - metajack:media-query-list, r=jdm
Implement matchMedia and MediaQueryList
<!-- Please describe your changes on the following line: -->
---
<!-- 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
- [ ] These changes fix #13376 (github issue number if applicable).
<!-- 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. -->
Fixes #13376.
<!-- 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/13453)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings/trace.rs')
-rw-r--r-- | components/script/dom/bindings/trace.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 9ac91f7078c..e0f65d9f6e1 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -91,6 +91,7 @@ use std::time::{SystemTime, Instant}; use string_cache::{Atom, Namespace, QualName}; use style::attr::{AttrIdentifier, AttrValue, LengthOrPercentageOrAuto}; use style::element_state::*; +use style::media_queries::MediaQueryList; use style::properties::PropertyDeclarationBlock; use style::selector_impl::{ElementSnapshot, PseudoElement}; use style::values::specified::Length; @@ -367,7 +368,7 @@ no_jsmanaged_fields!(WebGLProgramId); no_jsmanaged_fields!(WebGLRenderbufferId); no_jsmanaged_fields!(WebGLShaderId); no_jsmanaged_fields!(WebGLTextureId); - +no_jsmanaged_fields!(MediaQueryList); impl JSTraceable for Box<ScriptChan + Send> { #[inline] |