diff options
| author | Bryan Bell <bryan.w.bell@gmail.com> | 2014-08-28 13:56:01 -0700 |
|---|---|---|
| committer | Martin Robinson <mrobinson@igalia.com> | 2014-09-12 10:47:50 -0700 |
| commit | c1823083504b91e909dfccc4cc87cb4ab90238db (patch) | |
| tree | ce6b8e9c8d0aa0fb3aa785df0bb5ae9196b0db59 /components/script/script_task.rs | |
| parent | a2ab6f97991aa877a19ed24976694d451ac450cf (diff) | |
| download | servo-c1823083504b91e909dfccc4cc87cb4ab90238db.tar.gz servo-c1823083504b91e909dfccc4cc87cb4ab90238db.zip | |
Store Compositor ReadyState per-pipeline
Instead of storing a single ReadyState, store one per pipeline and
track the earliest one.
Diffstat (limited to 'components/script/script_task.rs')
| -rw-r--r-- | components/script/script_task.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs index e49dc600211..e743b9a098e 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -512,7 +512,8 @@ impl ScriptTask { let mut layout_join_port = page.layout_join_port.deref().borrow_mut(); *layout_join_port = None; } - self.compositor.set_ready_state(FinishedLoading); + + self.compositor.set_ready_state(pipeline_id, FinishedLoading); if page.pending_reflows.get() > 0 { page.pending_reflows.set(0); @@ -616,7 +617,7 @@ impl ScriptTask { let document = Document::new(&*window, Some(url.clone()), HTMLDocument, None).root(); window.deref().init_browser_context(&*document); - self.compositor.set_ready_state(Loading); + self.compositor.set_ready_state(pipeline_id, Loading); // Parse HTML. // // Note: We can parse the next document in parallel with any previous documents. |