aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-08-30 10:19:15 -0600
committerbors-servo <metajack+bors@gmail.com>2015-08-30 10:19:15 -0600
commit3062e0c7b11196e478a7e530e5b969adcce8bf4b (patch)
treebd6eb8568f1266e942c1eb249ac85575ad8ed2e4 /components/script
parent79328c11e320ad10a19d64d280df2e292eaf2e03 (diff)
parent8d4ed7292d6644bf2f148bc0e33af264434da50e (diff)
downloadservo-3062e0c7b11196e478a7e530e5b969adcce8bf4b.tar.gz
servo-3062e0c7b11196e478a7e530e5b969adcce8bf4b.zip
Auto merge of #7445 - JoshTheGoldfish:Issue6934, r=Manishearth
Issue #6934 - Implement onerror event handler for AbstractWorker Please review. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7445) <!-- Reviewable:end -->
Diffstat (limited to 'components/script')
-rw-r--r--components/script/dom/webidls/Worker.webidl2
-rw-r--r--components/script/dom/worker.rs1
2 files changed, 2 insertions, 1 deletions
diff --git a/components/script/dom/webidls/Worker.webidl b/components/script/dom/webidls/Worker.webidl
index 9e5d2c36ad9..481c2d44849 100644
--- a/components/script/dom/webidls/Worker.webidl
+++ b/components/script/dom/webidls/Worker.webidl
@@ -6,7 +6,7 @@
// https://www.whatwg.org/html/#abstractworker
[NoInterfaceObject/*, Exposed=Window,Worker*/]
interface AbstractWorker {
- // attribute EventHandler onerror;
+ attribute EventHandler onerror;
};
// https://www.whatwg.org/html/#worker
diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs
index 435de83ecff..d2b3982c805 100644
--- a/components/script/dom/worker.rs
+++ b/components/script/dom/worker.rs
@@ -163,6 +163,7 @@ impl WorkerMethods for Worker {
}
event_handler!(message, GetOnmessage, SetOnmessage);
+ event_handler!(error, GetOnerror, SetOnerror);
}
pub struct WorkerMessageHandler {