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

Fix requestAnimationFrame in headless mode. Fixes #7296.

Browse source
This commit is contained in:
Glenn Watson 2015-08-28 07:55:18 +10:00
parent 856fda7f2e
commit 103feca08b
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/compositing/headless.rs
View file

@ -7,6 +7,7 @@ use windowing::WindowEvent;
use euclid::scale_factor::ScaleFactor; use euclid::scale_factor::ScaleFactor;
use euclid::size::Size2D; use euclid::size::Size2D;
use msg::constellation_msg::AnimationState;
use msg::constellation_msg::Msg as ConstellationMsg; use msg::constellation_msg::Msg as ConstellationMsg;
use msg::constellation_msg::{ConstellationChan, WindowSizeData}; use msg::constellation_msg::{ConstellationChan, WindowSizeData};
use profile_traits::mem; use profile_traits::mem;
@ -88,6 +89,18 @@ impl CompositorEventListener for NullCompositor {
response_chan.send(()).unwrap(); response_chan.send(()).unwrap();
} }
Msg::ChangeRunningAnimationsState(pipeline_id, animation_state) => {
match animation_state {
AnimationState::AnimationsPresent |
AnimationState::NoAnimationsPresent |
AnimationState::NoAnimationCallbacksPresent => {}
AnimationState::AnimationCallbacksPresent => {
let msg = ConstellationMsg::TickAnimation(pipeline_id);
self.constellation_chan.0.send(msg).unwrap()
}
}
}
// Explicitly list ignored messages so that when we add a new one, // Explicitly list ignored messages so that when we add a new one,
// we'll notice and think about whether it needs a response, like // we'll notice and think about whether it needs a response, like
// SetFrameTree. // SetFrameTree.
@ -95,7 +108,6 @@ impl CompositorEventListener for NullCompositor {
Msg::InitializeLayersForPipeline(..) | Msg::InitializeLayersForPipeline(..) |
Msg::SetLayerRect(..) | Msg::SetLayerRect(..) |
Msg::AssignPaintedBuffers(..) | Msg::AssignPaintedBuffers(..) |
Msg::ChangeRunningAnimationsState(..) |
Msg::ScrollFragmentPoint(..) | Msg::ScrollFragmentPoint(..) |
Msg::Status(..) | Msg::Status(..) |
Msg::LoadStart(..) | Msg::LoadStart(..) |

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

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

2
tests/wpt/mozilla/tests/mozilla/window_requestAnimationFrame.html
View file

@ -8,8 +8,6 @@
<script> <script>
async_test(function() { async_test(function() {
window.requestAnimationFrame(this.step_func_done()); window.requestAnimationFrame(this.step_func_done());
// FIXME(#7296)
setTimeout(this.step_func_done(), 500);
}); });
</script> </script>
</body> </body>