From 0e3c54c1911ba2c3bf305ee04f04fcd9bf2fc2fe Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Mon, 25 Sep 2017 23:30:24 +0200 Subject: Rename dom::bindings::js to dom::bindings::root --- components/script/dom/touch.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/script/dom/touch.rs') diff --git a/components/script/dom/touch.rs b/components/script/dom/touch.rs index 3ebfd17af12..d7920a2dd19 100644 --- a/components/script/dom/touch.rs +++ b/components/script/dom/touch.rs @@ -4,9 +4,9 @@ use dom::bindings::codegen::Bindings::TouchBinding; use dom::bindings::codegen::Bindings::TouchBinding::TouchMethods; -use dom::bindings::js::{MutJS, Root}; use dom::bindings::num::Finite; use dom::bindings::reflector::{Reflector, reflect_dom_object}; +use dom::bindings::root::{MutJS, Root}; use dom::eventtarget::EventTarget; use dom::window::Window; use dom_struct::dom_struct; -- cgit v1.2.3 From d29335040d78a19f25830061484cf70dc03a9c21 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Tue, 26 Sep 2017 00:16:22 +0200 Subject: Rename MutJS to MutDom --- components/script/dom/touch.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'components/script/dom/touch.rs') diff --git a/components/script/dom/touch.rs b/components/script/dom/touch.rs index d7920a2dd19..d526e607d8d 100644 --- a/components/script/dom/touch.rs +++ b/components/script/dom/touch.rs @@ -6,7 +6,7 @@ use dom::bindings::codegen::Bindings::TouchBinding; use dom::bindings::codegen::Bindings::TouchBinding::TouchMethods; use dom::bindings::num::Finite; use dom::bindings::reflector::{Reflector, reflect_dom_object}; -use dom::bindings::root::{MutJS, Root}; +use dom::bindings::root::{MutDom, Root}; use dom::eventtarget::EventTarget; use dom::window::Window; use dom_struct::dom_struct; @@ -15,7 +15,7 @@ use dom_struct::dom_struct; pub struct Touch { reflector_: Reflector, identifier: i32, - target: MutJS, + target: MutDom, screen_x: f64, screen_y: f64, client_x: f64, @@ -32,7 +32,7 @@ impl Touch { Touch { reflector_: Reflector::new(), identifier: identifier, - target: MutJS::new(target), + target: MutDom::new(target), screen_x: *screen_x, screen_y: *screen_y, client_x: *client_x, -- cgit v1.2.3 From f87c2a8d7616112ca924e30292db2d244cf87eec Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Tue, 26 Sep 2017 01:53:40 +0200 Subject: Rename Root to DomRoot In a later PR, DomRoot will become a type alias of Root>, where Root will be able to handle all the things that need to be rooted that have a stable traceable address that doesn't move for the whole lifetime of the root. Stay tuned. --- components/script/dom/touch.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'components/script/dom/touch.rs') diff --git a/components/script/dom/touch.rs b/components/script/dom/touch.rs index d526e607d8d..e12fce6379c 100644 --- a/components/script/dom/touch.rs +++ b/components/script/dom/touch.rs @@ -6,7 +6,7 @@ use dom::bindings::codegen::Bindings::TouchBinding; use dom::bindings::codegen::Bindings::TouchBinding::TouchMethods; use dom::bindings::num::Finite; use dom::bindings::reflector::{Reflector, reflect_dom_object}; -use dom::bindings::root::{MutDom, Root}; +use dom::bindings::root::{DomRoot, MutDom}; use dom::eventtarget::EventTarget; use dom::window::Window; use dom_struct::dom_struct; @@ -45,7 +45,7 @@ impl Touch { pub fn new(window: &Window, identifier: i32, target: &EventTarget, screen_x: Finite, screen_y: Finite, client_x: Finite, client_y: Finite, - page_x: Finite, page_y: Finite) -> Root { + page_x: Finite, page_y: Finite) -> DomRoot { reflect_dom_object(box Touch::new_inherited(identifier, target, screen_x, screen_y, client_x, client_y, @@ -62,7 +62,7 @@ impl TouchMethods for Touch { } /// https://w3c.github.io/touch-events/#widl-Touch-target - fn Target(&self) -> Root { + fn Target(&self) -> DomRoot { self.target.get() } -- cgit v1.2.3 From aa15dc269f41503d81ad44cd7e85d69e6f4aeac7 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Mon, 16 Oct 2017 14:35:30 +0200 Subject: Remove use of unstable box syntax. http://www.robohornet.org gives a score of 101.36 on master, and 102.68 with this PR. The latter is slightly better, but probably within noise level. So it looks like this PR does not affect DOM performance. This is expected since `Box::new` is defined as: ```rust impl Box { #[inline(always)] pub fn new(x: T) -> Box { box x } } ``` With inlining, it should compile to the same as box syntax. --- components/script/dom/touch.rs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'components/script/dom/touch.rs') diff --git a/components/script/dom/touch.rs b/components/script/dom/touch.rs index e12fce6379c..77ad2d822c5 100644 --- a/components/script/dom/touch.rs +++ b/components/script/dom/touch.rs @@ -46,12 +46,16 @@ impl Touch { screen_x: Finite, screen_y: Finite, client_x: Finite, client_y: Finite, page_x: Finite, page_y: Finite) -> DomRoot { - reflect_dom_object(box Touch::new_inherited(identifier, target, - screen_x, screen_y, - client_x, client_y, - page_x, page_y), - window, - TouchBinding::Wrap) + reflect_dom_object(Box::new( + Touch::new_inherited( + identifier, target, + screen_x, screen_y, + client_x, client_y, + page_x, page_y + )), + window, + TouchBinding::Wrap + ) } } -- cgit v1.2.3 From efc3683cc7ceff0cd8c8528a168a78d42fb1a0e8 Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Tue, 17 Oct 2017 09:39:20 -0700 Subject: Fix commonmark Markdown warnings in docs, part 1 Fixes warnings from rust-lang/rust#44229 when `--enable-commonmark` is passed to rustdoc. This is mostly a global find-and-replace for bare URIs on lines by themselves in doc comments. --- components/script/dom/touch.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'components/script/dom/touch.rs') diff --git a/components/script/dom/touch.rs b/components/script/dom/touch.rs index 77ad2d822c5..2109f8d1ce9 100644 --- a/components/script/dom/touch.rs +++ b/components/script/dom/touch.rs @@ -60,42 +60,42 @@ impl Touch { } impl TouchMethods for Touch { - /// https://w3c.github.io/touch-events/#widl-Touch-identifier + /// fn Identifier(&self) -> i32 { self.identifier } - /// https://w3c.github.io/touch-events/#widl-Touch-target + /// fn Target(&self) -> DomRoot { self.target.get() } - /// https://w3c.github.io/touch-events/#widl-Touch-screenX + /// fn ScreenX(&self) -> Finite { Finite::wrap(self.screen_x) } - /// https://w3c.github.io/touch-events/#widl-Touch-screenY + /// fn ScreenY(&self) -> Finite { Finite::wrap(self.screen_y) } - /// https://w3c.github.io/touch-events/#widl-Touch-clientX + /// fn ClientX(&self) -> Finite { Finite::wrap(self.client_x) } - /// https://w3c.github.io/touch-events/#widl-Touch-clientY + /// fn ClientY(&self) -> Finite { Finite::wrap(self.client_y) } - /// https://w3c.github.io/touch-events/#widl-Touch-clientX + /// fn PageX(&self) -> Finite { Finite::wrap(self.page_x) } - /// https://w3c.github.io/touch-events/#widl-Touch-clientY + /// fn PageY(&self) -> Finite { Finite::wrap(self.page_y) } -- cgit v1.2.3 From c37a345dc9f4dda6ea29c42f96f6c7201c42cbac Mon Sep 17 00:00:00 2001 From: chansuke Date: Tue, 18 Sep 2018 23:24:15 +0900 Subject: Format script component --- components/script/dom/touch.rs | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) (limited to 'components/script/dom/touch.rs') diff --git a/components/script/dom/touch.rs b/components/script/dom/touch.rs index 2109f8d1ce9..c1b47a4df94 100644 --- a/components/script/dom/touch.rs +++ b/components/script/dom/touch.rs @@ -25,10 +25,16 @@ pub struct Touch { } impl Touch { - fn new_inherited(identifier: i32, target: &EventTarget, - screen_x: Finite, screen_y: Finite, - client_x: Finite, client_y: Finite, - page_x: Finite, page_y: Finite) -> Touch { + fn new_inherited( + identifier: i32, + target: &EventTarget, + screen_x: Finite, + screen_y: Finite, + client_x: Finite, + client_y: Finite, + page_x: Finite, + page_y: Finite, + ) -> Touch { Touch { reflector_: Reflector::new(), identifier: identifier, @@ -42,19 +48,23 @@ impl Touch { } } - pub fn new(window: &Window, identifier: i32, target: &EventTarget, - screen_x: Finite, screen_y: Finite, - client_x: Finite, client_y: Finite, - page_x: Finite, page_y: Finite) -> DomRoot { - reflect_dom_object(Box::new( - Touch::new_inherited( - identifier, target, - screen_x, screen_y, - client_x, client_y, - page_x, page_y + pub fn new( + window: &Window, + identifier: i32, + target: &EventTarget, + screen_x: Finite, + screen_y: Finite, + client_x: Finite, + client_y: Finite, + page_x: Finite, + page_y: Finite, + ) -> DomRoot { + reflect_dom_object( + Box::new(Touch::new_inherited( + identifier, target, screen_x, screen_y, client_x, client_y, page_x, page_y, )), window, - TouchBinding::Wrap + TouchBinding::Wrap, ) } } -- cgit v1.2.3 From 45f7199eee82c66637ec68287eafa40a651001c4 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 1 Nov 2018 23:45:06 +0100 Subject: `cargo fix --edition` --- components/script/dom/touch.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'components/script/dom/touch.rs') diff --git a/components/script/dom/touch.rs b/components/script/dom/touch.rs index c1b47a4df94..e89310cb231 100644 --- a/components/script/dom/touch.rs +++ b/components/script/dom/touch.rs @@ -2,13 +2,13 @@ * 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::TouchBinding; -use dom::bindings::codegen::Bindings::TouchBinding::TouchMethods; -use dom::bindings::num::Finite; -use dom::bindings::reflector::{Reflector, reflect_dom_object}; -use dom::bindings::root::{DomRoot, MutDom}; -use dom::eventtarget::EventTarget; -use dom::window::Window; +use crate::dom::bindings::codegen::Bindings::TouchBinding; +use crate::dom::bindings::codegen::Bindings::TouchBinding::TouchMethods; +use crate::dom::bindings::num::Finite; +use crate::dom::bindings::reflector::{Reflector, reflect_dom_object}; +use crate::dom::bindings::root::{DomRoot, MutDom}; +use crate::dom::eventtarget::EventTarget; +use crate::dom::window::Window; use dom_struct::dom_struct; #[dom_struct] -- cgit v1.2.3 From 9e92eb205a2a12fe0be883e42cb7f82deebc9031 Mon Sep 17 00:00:00 2001 From: Pyfisch Date: Tue, 6 Nov 2018 20:38:02 +0100 Subject: Reorder imports --- components/script/dom/touch.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/script/dom/touch.rs') diff --git a/components/script/dom/touch.rs b/components/script/dom/touch.rs index e89310cb231..4fb66c77b4e 100644 --- a/components/script/dom/touch.rs +++ b/components/script/dom/touch.rs @@ -5,7 +5,7 @@ use crate::dom::bindings::codegen::Bindings::TouchBinding; use crate::dom::bindings::codegen::Bindings::TouchBinding::TouchMethods; use crate::dom::bindings::num::Finite; -use crate::dom::bindings::reflector::{Reflector, reflect_dom_object}; +use crate::dom::bindings::reflector::{reflect_dom_object, Reflector}; use crate::dom::bindings::root::{DomRoot, MutDom}; use crate::dom::eventtarget::EventTarget; use crate::dom::window::Window; -- cgit v1.2.3 From a1a14459c141afc6ac6771b8a6c9ca374537edf2 Mon Sep 17 00:00:00 2001 From: Jan Andre Ikenmeyer Date: Mon, 19 Nov 2018 14:47:12 +0100 Subject: Update MPL license to https (part 3) --- components/script/dom/touch.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/script/dom/touch.rs') diff --git a/components/script/dom/touch.rs b/components/script/dom/touch.rs index 4fb66c77b4e..139f1206a04 100644 --- a/components/script/dom/touch.rs +++ b/components/script/dom/touch.rs @@ -1,6 +1,6 @@ /* 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/. */ + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ use crate::dom::bindings::codegen::Bindings::TouchBinding; use crate::dom::bindings::codegen::Bindings::TouchBinding::TouchMethods; -- cgit v1.2.3 From 3ea6d87bcc37167464e856949a4b9b77d0e9318a Mon Sep 17 00:00:00 2001 From: YUAN LYU Date: Fri, 20 Mar 2020 22:14:18 -0400 Subject: Add trait DomObjectWrap to provide WRAP function --- components/script/dom/touch.rs | 2 -- 1 file changed, 2 deletions(-) (limited to 'components/script/dom/touch.rs') diff --git a/components/script/dom/touch.rs b/components/script/dom/touch.rs index 139f1206a04..60e69a48ca3 100644 --- a/components/script/dom/touch.rs +++ b/components/script/dom/touch.rs @@ -2,7 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -use crate::dom::bindings::codegen::Bindings::TouchBinding; use crate::dom::bindings::codegen::Bindings::TouchBinding::TouchMethods; use crate::dom::bindings::num::Finite; use crate::dom::bindings::reflector::{reflect_dom_object, Reflector}; @@ -64,7 +63,6 @@ impl Touch { identifier, target, screen_x, screen_y, client_x, client_y, page_x, page_y, )), window, - TouchBinding::Wrap, ) } } -- cgit v1.2.3