Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #6880 - dzbarsky:rAF, r=jdm

Browse source 
Don't try to unwrap the result of requestAnimationFrame callback



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6880)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-26 08:13:11 -06:00
commit 186c1d14d5
4 changed files with 37 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/script/dom/window.rs
View file

@ -530,7 +530,8 @@ impl<'a> WindowMethods for &'a Window {
let callback = move |now: f64| { let callback = move |now: f64| {
// TODO: @jdm The spec says that any exceptions should be suppressed; // TODO: @jdm The spec says that any exceptions should be suppressed;
callback.Call__(Finite::wrap(now), ExceptionHandling::Report).unwrap(); // https://github.com/servo/servo/issues/6928
let _ = callback.Call__(Finite::wrap(now), ExceptionHandling::Report);
}; };
doc.r().request_animation_frame(Box::new(callback)) doc.r().request_animation_frame(Box::new(callback))

6
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -779,6 +779,12 @@
"url": "/_mozilla/mozilla/window_requestAnimationFrame.html" "url": "/_mozilla/mozilla/window_requestAnimationFrame.html"
} }
], ],
"mozilla/window_requestAnimationFrame2.html": [
{
"path": "mozilla/window_requestAnimationFrame2.html",
"url": "/_mozilla/mozilla/window_requestAnimationFrame2.html"
}
],
"mozilla/window_setInterval.html": [ "mozilla/window_setInterval.html": [
{ {
"path": "mozilla/window_setInterval.html", "path": "mozilla/window_setInterval.html",

6
tests/wpt/mozilla/meta/mozilla/window_requestAnimationFrame2.html.ini Normal file
View file

@ -0,0 +1,6 @@
[window_requestAnimationFrame2.html]
type: testharness
expected: TIMEOUT
[Test throwing an error inside requestAnimationFrame callback]
expected: NOTRUN

23
tests/wpt/mozilla/tests/mozilla/window_requestAnimationFrame2.html Normal file
View file

@ -0,0 +1,23 @@
<html>
<head>
<title>Test throwing an error inside requestAnimationFrame callback</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
</head>
<body>
<script>
var stepCalled = false;
function step() {
if (stepCalled) {
setTimeout(done, 0);
} else {
stepCalled = true;
window.requestAnimationFrame(step);
}
throw new Error();
}
window.requestAnimationFrame(step);
assert_equals(true, true, "rAF should not throw errors");
</script>
</body>
</html>