aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/document.rs
diff options
context:
space:
mode:
authorPaul Rouget <me@paulrouget.com>2018-02-07 10:10:58 +0100
committerPaul Rouget <me@paulrouget.com>2018-02-11 08:02:39 +0100
commite7c754fb64bf200cf64f7c7c4104f8489d117965 (patch)
tree657c8511c03a188d5d2e744a27271d610312c912 /components/script/dom/document.rs
parent019fdaa1bd57c150547c02641fac621e41d0b9e2 (diff)
downloadservo-e7c754fb64bf200cf64f7c7c4104f8489d117965.tar.gz
servo-e7c754fb64bf200cf64f7c7c4104f8489d117965.zip
remove forcetouch support
Diffstat (limited to 'components/script/dom/document.rs')
-rw-r--r--components/script/dom/document.rs65
1 files changed, 1 insertions, 64 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index a24382ab80a..e148b939afc 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -42,7 +42,6 @@ use dom::errorevent::ErrorEvent;
use dom::event::{Event, EventBubbles, EventCancelable, EventDefault, EventStatus};
use dom::eventtarget::EventTarget;
use dom::focusevent::FocusEvent;
-use dom::forcetouchevent::ForceTouchEvent;
use dom::globalscope::GlobalScope;
use dom::hashchangeevent::HashChangeEvent;
use dom::htmlanchorelement::HTMLAnchorElement;
@@ -112,8 +111,7 @@ use script_layout_interface::message::{Msg, NodesFromPointQueryType, ReflowGoal}
use script_runtime::{CommonScriptMsg, ScriptThreadEventCategory};
use script_thread::{MainThreadScriptMsg, ScriptThread};
use script_traits::{AnimationState, DocumentActivity, MouseButton, MouseEventType};
-use script_traits::{MozBrowserEvent, MsDuration, ScriptMsg, TouchEventType, TouchId};
-use script_traits::{TouchpadPressurePhase, UntrustedNodeAddress};
+use script_traits::{MozBrowserEvent, MsDuration, ScriptMsg, TouchEventType, TouchId, UntrustedNodeAddress};
use servo_arc::Arc;
use servo_atoms::Atom;
use servo_config::prefs::PREFS;
@@ -328,7 +326,6 @@ pub struct Document {
load_event_end: Cell<u64>,
/// <https://html.spec.whatwg.org/multipage/#concept-document-https-state>
https_state: Cell<HttpsState>,
- touchpad_pressure_phase: Cell<TouchpadPressurePhase>,
/// The document's origin.
origin: MutableOrigin,
/// https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-states
@@ -998,65 +995,6 @@ impl Document {
*self.last_click_info.borrow_mut() = Some((now, click_pos));
}
- #[allow(unsafe_code)]
- pub fn handle_touchpad_pressure_event(
- &self,
- js_runtime: *mut JSRuntime,
- pressure: f32,
- phase_now: TouchpadPressurePhase,
- node_address: Option<UntrustedNodeAddress>
- ) {
- let el = node_address.and_then(|address| {
- let node = unsafe { node::from_untrusted_node_address(js_runtime, address) };
- node.inclusive_ancestors()
- .filter_map(DomRoot::downcast::<Element>)
- .next()
- });
- let el = match el {
- Some(el) => el,
- None => return,
- };
-
- let phase_before = self.touchpad_pressure_phase.get();
- self.touchpad_pressure_phase.set(phase_now);
-
- if phase_before == TouchpadPressurePhase::BeforeClick &&
- phase_now == TouchpadPressurePhase::BeforeClick {
- return;
- }
-
- let node = el.upcast::<Node>();
- let target = node.upcast();
-
- let force = match phase_now {
- TouchpadPressurePhase::BeforeClick => pressure,
- TouchpadPressurePhase::AfterFirstClick => 1. + pressure,
- TouchpadPressurePhase::AfterSecondClick => 2. + pressure,
- };
-
- if phase_now != TouchpadPressurePhase::BeforeClick {
- self.fire_forcetouch_event("servomouseforcechanged".to_owned(), target, force);
- }
-
- if phase_before != TouchpadPressurePhase::AfterSecondClick &&
- phase_now == TouchpadPressurePhase::AfterSecondClick {
- self.fire_forcetouch_event("servomouseforcedown".to_owned(), target, force);
- }
-
- if phase_before == TouchpadPressurePhase::AfterSecondClick &&
- phase_now != TouchpadPressurePhase::AfterSecondClick {
- self.fire_forcetouch_event("servomouseforceup".to_owned(), target, force);
- }
- }
-
- fn fire_forcetouch_event(&self, event_name: String, target: &EventTarget, force: f32) {
- let force_event = ForceTouchEvent::new(&self.window,
- DOMString::from(event_name),
- force);
- let event = force_event.upcast::<Event>();
- event.fire(target);
- }
-
pub fn fire_mouse_event(&self, client_point: Point2D<f32>, target: &EventTarget, event_name: FireMouseEventType) {
let client_x = client_point.x.to_i32().unwrap_or(0);
let client_y = client_point.y.to_i32().unwrap_or(0);
@@ -2297,7 +2235,6 @@ impl Document {
load_event_start: Cell::new(Default::default()),
load_event_end: Cell::new(Default::default()),
https_state: Cell::new(HttpsState::None),
- touchpad_pressure_phase: Cell::new(TouchpadPressurePhase::BeforeClick),
origin: origin,
referrer: referrer,
referrer_policy: Cell::new(referrer_policy),