servo: Merge #8492 - script: Make timer events e10s-safe (from jdm:e10s-timer-events); r=jdm

Closes #8235. Source-Repo: https://github.com/servo/servo Source-Revision: 9eaa8e7b1f2e462f62b73477c30183c836a18399
2015-11-13 04:49:48 +05:00
parent 2a87f91a4c
commit b0cfd94d48
12 changed files with 64 additions and 97 deletions
--- a/servo/components/msg/compositor_msg.rs
+++ b/servo/components/msg/compositor_msg.rs
@@ -169,3 +169,4 @@ pub enum EventResult {
    DefaultAllowed,
    DefaultPrevented,
 }
+