Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use fn pipeline_id consistently, not fn pipeline

Browse source 
Consistently use the name 'pipeline_id' to refer to a function that
returns an (optional) PipelineId.

This was prompted by discovering both fn pipeline and fn pipeline_id
doing the same job in htmliframeelement.rs.

Note that there is fn pipeline in components/compositing/compositor.rs,
but that actually returns an Option<&CompositionPipeline>, not any kind
of PipelineId.
This commit is contained in:
Aneesh Agrawal 2016-06-09 07:01:24 -04:00
parent bb53da6957
commit 9d097e7d15
20 changed files with 50 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/script/script_thread.rs
View file

@ -644,7 +644,7 @@ impl ScriptThread {
let window = context.active_window();
let resize_event = window.steal_resize_event();
match resize_event {
Some(size) => resizes.push((window.pipeline(), size)),
Some(size) => resizes.push((window.pipeline_id(), size)),
None => ()
}
}
@ -1502,7 +1502,7 @@ impl ScriptThread {
// If root is being exited, shut down all contexts
let context = self.root_browsing_context();
let window = context.active_window();
if window.pipeline() == id {
if window.pipeline_id() == id {
debug!("shutting down layout for root context {:?}", id);
shut_down_layout(&context);
let _ = self.constellation_chan.send(ConstellationMsg::PipelineExited(id));
@ -1698,7 +1698,7 @@ impl ScriptThread {
});
let loader = DocumentLoader::new_with_threads(self.resource_threads.clone(),
Some(browsing_context.pipeline()),
Some(browsing_context.pipeline_id()),
Some(incomplete.url.clone()));
let is_html_document = match metadata.content_type {
@ -1754,7 +1754,7 @@ impl ScriptThread {
.unwrap();
// Notify devtools that a new script global exists.
self.notify_devtools(document.Title(), final_url.clone(), (browsing_context.pipeline(), None));
self.notify_devtools(document.Title(), final_url.clone(), (browsing_context.pipeline_id(), None));
let is_javascript = incomplete.url.scheme() == "javascript";
let parse_input = if is_javascript {
@ -1818,7 +1818,7 @@ impl ScriptThread {
}
if !incomplete.is_visible {
self.alter_resource_utilization(browsing_context.pipeline(), false);
self.alter_resource_utilization(browsing_context.pipeline_id(), false);
}
context_remover.neuter();