aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2015-12-21 01:19:41 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2015-12-21 01:19:41 +0530
commit5b91daa92378d3b9fe80b2fc8f8072085d4949b3 (patch)
treeeafe63e5f93478c54a4bfd9c4c992aae1bceb62f /components/script/dom
parent62b11a28fa41d6665408844eb7b09d3479c4ea20 (diff)
parentae8d3f67c88396fa2350964121090f0d6b775f80 (diff)
downloadservo-5b91daa92378d3b9fe80b2fc8f8072085d4949b3.tar.gz
servo-5b91daa92378d3b9fe80b2fc8f8072085d4949b3.zip
Auto merge of #9025 - k-cross:master, r=nox
touchlist dom api #8225 Sorry for the wait, I just finished my finals. Fixes #8225 <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9025) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/document.rs5
-rw-r--r--components/script/dom/webidls/Document.webidl4
2 files changed, 7 insertions, 2 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index d682188c461..79b3dd41f85 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -1993,6 +1993,11 @@ impl DocumentMethods for Document {
pageY)
}
+ // https://w3c.github.io/touch-events/#idl-def-document-createtouchlist(touch...)
+ fn CreateTouchList(&self, touches: &[&Touch]) -> Root<TouchList> {
+ TouchList::new(&self.window, &touches)
+ }
+
// https://dom.spec.whatwg.org/#dom-document-createtreewalker
fn CreateTreeWalker(&self,
root: &Node,
diff --git a/components/script/dom/webidls/Document.webidl b/components/script/dom/webidls/Document.webidl
index 10199205537..ba76e60e8de 100644
--- a/components/script/dom/webidls/Document.webidl
+++ b/components/script/dom/webidls/Document.webidl
@@ -176,6 +176,6 @@ partial interface Document {
double pageY,
double screenX,
double screenY);
- // FIXME (#8159):
- // TouchList createTouchList(Touch... touches);
+
+ TouchList createTouchList(Touch... touches);
};