aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_task.rs
diff options
context:
space:
mode:
authorMatt Brubeck <mbrubeck@limpet.net>2015-08-14 07:24:50 -0700
committerMatt Brubeck <mbrubeck@limpet.net>2015-10-22 10:37:03 -0700
commitfe7460f34d20d5f17d21d60e1053028b21c63ebc (patch)
tree6cc401775f503ce01b528021cc87bc7580fc7140 /components/script/script_task.rs
parent4ed15a8853fc49d0940ed24d939fd0c407ee80a9 (diff)
downloadservo-fe7460f34d20d5f17d21d60e1053028b21c63ebc.tar.gz
servo-fe7460f34d20d5f17d21d60e1053028b21c63ebc.zip
Dispatch touch events and perform default touch actions.
This is currently limited to simple single-touch actions. It does not include momentum scrolling or pinch zooming.
Diffstat (limited to 'components/script/script_task.rs')
-rw-r--r--components/script/script_task.rs35
1 files changed, 34 insertions, 1 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index a090d1c91ef..2b6f4c252d6 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -60,7 +60,7 @@ use layout_interface::{ReflowQueryType};
use layout_interface::{self, LayoutChan, NewLayoutTaskInfo, ReflowGoal, ScriptLayoutChan};
use libc;
use mem::heap_size_of_self_and_children;
-use msg::compositor_msg::{LayerId, ScriptToCompositorMsg};
+use msg::compositor_msg::{EventResult, LayerId, ScriptToCompositorMsg};
use msg::constellation_msg::Msg as ConstellationMsg;
use msg::constellation_msg::{ConstellationChan, FocusType, LoadData};
use msg::constellation_msg::{MozBrowserEvent, PipelineExitType, PipelineId};
@@ -79,6 +79,7 @@ use profile_traits::time::{self, ProfilerCategory, profile};
use script_traits::CompositorEvent::{ClickEvent, ResizeEvent};
use script_traits::CompositorEvent::{KeyEvent, MouseMoveEvent};
use script_traits::CompositorEvent::{MouseDownEvent, MouseUpEvent};
+use script_traits::CompositorEvent::{TouchDownEvent, TouchMoveEvent, TouchUpEvent};
use script_traits::{CompositorEvent, ConstellationControlMsg};
use script_traits::{InitialScriptState, MouseButton, NewLayoutInfo};
use script_traits::{OpaqueScriptLayoutChannel, ScriptState, ScriptTaskFactory};
@@ -1784,6 +1785,27 @@ impl ScriptTask {
std_mem::swap(&mut *self.mouse_over_targets.borrow_mut(), &mut *mouse_over_targets);
}
+ TouchDownEvent(identifier, point) => {
+ let default_action_allowed =
+ self.handle_touch_event(pipeline_id, identifier, point, "touchstart");
+ if default_action_allowed {
+ // TODO: Wait to see if preventDefault is called on the first touchmove event.
+ self.compositor.borrow_mut().send(ScriptToCompositorMsg::TouchEventProcessed(
+ EventResult::DefaultAllowed)).unwrap();
+ } else {
+ self.compositor.borrow_mut().send(ScriptToCompositorMsg::TouchEventProcessed(
+ EventResult::DefaultPrevented)).unwrap();
+ }
+ }
+
+ TouchMoveEvent(identifier, point) => {
+ self.handle_touch_event(pipeline_id, identifier, point, "touchmove");
+ }
+
+ TouchUpEvent(identifier, point) => {
+ self.handle_touch_event(pipeline_id, identifier, point, "touchend");
+ }
+
KeyEvent(key, state, modifiers) => {
let page = get_page(&self.root_page(), pipeline_id);
let document = page.document();
@@ -1803,6 +1825,17 @@ impl ScriptTask {
document.r().handle_mouse_event(self.js_runtime.rt(), button, point, mouse_event_type);
}
+ fn handle_touch_event(&self,
+ pipeline_id: PipelineId,
+ identifier: i32,
+ point: Point2D<f32>,
+ event_name: &str) -> bool {
+ let page = get_page(&self.root_page(), pipeline_id);
+ let document = page.document();
+ document.r().handle_touch_event(self.js_runtime.rt(), identifier, point,
+ event_name.to_owned())
+ }
+
/// https://html.spec.whatwg.org/multipage/#navigating-across-documents
/// The entry point for content to notify that a new load has been requested
/// for the given pipeline (specifically the "navigate" algorithm).