aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/touchevent.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-09-19 17:47:27 -0400
committerGitHub <noreply@github.com>2018-09-19 17:47:27 -0400
commitdf2adebefdfa3da49f173e480fa1e56450f9bda2 (patch)
tree1f05b49bac02318455a59d5b143c186fd872bdb9 /components/script/dom/touchevent.rs
parent2ca7a134736bb4759ff209c1bc0b6dc3cc1984c9 (diff)
parentc37a345dc9f4dda6ea29c42f96f6c7201c42cbac (diff)
downloadservo-df2adebefdfa3da49f173e480fa1e56450f9bda2.tar.gz
servo-df2adebefdfa3da49f173e480fa1e56450f9bda2.zip
Auto merge of #21737 - chansuke:format_script, r=jdm
Format script component --- <!-- 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 part of #21373. - [x] These changes do not require tests because they format code only. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- 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/21737) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/touchevent.rs')
-rw-r--r--components/script/dom/touchevent.rs69
1 files changed, 42 insertions, 27 deletions
diff --git a/components/script/dom/touchevent.rs b/components/script/dom/touchevent.rs
index 3f8db82c01a..021cefec52e 100644
--- a/components/script/dom/touchevent.rs
+++ b/components/script/dom/touchevent.rs
@@ -29,9 +29,11 @@ pub struct TouchEvent {
}
impl TouchEvent {
- fn new_inherited(touches: &TouchList,
- changed_touches: &TouchList,
- target_touches: &TouchList) -> TouchEvent {
+ fn new_inherited(
+ touches: &TouchList,
+ changed_touches: &TouchList,
+ target_touches: &TouchList,
+ ) -> TouchEvent {
TouchEvent {
uievent: UIEvent::new_inherited(),
touches: MutDom::new(touches),
@@ -44,33 +46,46 @@ impl TouchEvent {
}
}
- pub fn new_uninitialized(window: &Window,
- touches: &TouchList,
- changed_touches: &TouchList,
- target_touches: &TouchList) -> DomRoot<TouchEvent> {
- reflect_dom_object(Box::new(TouchEvent::new_inherited(touches, changed_touches, target_touches)),
- window,
- TouchEventBinding::Wrap)
+ pub fn new_uninitialized(
+ window: &Window,
+ touches: &TouchList,
+ changed_touches: &TouchList,
+ target_touches: &TouchList,
+ ) -> DomRoot<TouchEvent> {
+ reflect_dom_object(
+ Box::new(TouchEvent::new_inherited(
+ touches,
+ changed_touches,
+ target_touches,
+ )),
+ window,
+ TouchEventBinding::Wrap,
+ )
}
- pub fn new(window: &Window,
- type_: DOMString,
- can_bubble: EventBubbles,
- cancelable: EventCancelable,
- view: Option<&Window>,
- detail: i32,
- touches: &TouchList,
- changed_touches: &TouchList,
- target_touches: &TouchList,
- ctrl_key: bool,
- alt_key: bool,
- shift_key: bool,
- meta_key: bool) -> DomRoot<TouchEvent> {
+ pub fn new(
+ window: &Window,
+ type_: DOMString,
+ can_bubble: EventBubbles,
+ cancelable: EventCancelable,
+ view: Option<&Window>,
+ detail: i32,
+ touches: &TouchList,
+ changed_touches: &TouchList,
+ target_touches: &TouchList,
+ ctrl_key: bool,
+ alt_key: bool,
+ shift_key: bool,
+ meta_key: bool,
+ ) -> DomRoot<TouchEvent> {
let ev = TouchEvent::new_uninitialized(window, touches, changed_touches, target_touches);
- ev.upcast::<UIEvent>().InitUIEvent(type_,
- bool::from(can_bubble),
- bool::from(cancelable),
- view, detail);
+ ev.upcast::<UIEvent>().InitUIEvent(
+ type_,
+ bool::from(can_bubble),
+ bool::from(cancelable),
+ view,
+ detail,
+ );
ev.ctrl_key.set(ctrl_key);
ev.alt_key.set(alt_key);
ev.shift_key.set(shift_key);