aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_thread.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-04-05 21:07:05 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2016-04-05 21:07:05 +0530
commit0ff8adb09778402e88fe0d0ad92f4b399ca8ca01 (patch)
treefd3403bb54587c41f953e00740be30058c94543d /components/script/script_thread.rs
parenta8ed5c3fc66ab9ea57b6b78311485040dae27328 (diff)
parent0d529274a425f44b17a93d6823929eacb4ba96f2 (diff)
downloadservo-0ff8adb09778402e88fe0d0ad92f4b399ca8ca01.tar.gz
servo-0ff8adb09778402e88fe0d0ad92f4b399ca8ca01.zip
Auto merge of #9811 - paulrouget:forceTouch, r=mbrubeck
forcetouch events https://developer.apple.com/library/mac/documentation/AppleApplications/Conceptual/SafariJSProgTopics/RespondingtoForceTouchEventsfromJavaScript.html Not sure how we want to land that yet. Maybe reproduce the webkit events (as in this PR), or as touch/mousemouse events. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9811) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_thread.rs')
-rw-r--r--components/script/script_thread.rs8
1 files changed, 7 insertions, 1 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 5cd38e80532..6726a6ca4e2 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -79,7 +79,7 @@ use parse::xml::{self, parse_xml};
use profile_traits::mem::{self, OpaqueSender, Report, ReportKind, ReportsChan};
use profile_traits::time::{self, ProfilerCategory, profile};
use script_traits::CompositorEvent::{KeyEvent, MouseButtonEvent, MouseMoveEvent, ResizeEvent};
-use script_traits::CompositorEvent::{TouchEvent};
+use script_traits::CompositorEvent::{TouchEvent, TouchpadPressureEvent};
use script_traits::{CompositorEvent, ConstellationControlMsg, EventResult};
use script_traits::{InitialScriptState, MouseButton, MouseEventType, MozBrowserEvent, NewLayoutInfo};
use script_traits::{LayoutMsg, OpaqueScriptLayoutChannel, ScriptMsg as ConstellationMsg};
@@ -1969,6 +1969,12 @@ impl ScriptThread {
}
}
+ TouchpadPressureEvent(point, pressure, phase) => {
+ let page = get_page(&self.root_page(), pipeline_id);
+ let document = page.document();
+ document.r().handle_touchpad_pressure_event(self.js_runtime.rt(), point, pressure, phase);
+ }
+
KeyEvent(key, state, modifiers) => {
let page = get_page(&self.root_page(), pipeline_id);
let document = page.document();