Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 23:33:43 +01: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

6
components/webdriver_server/lib.rs
View file

@ -251,7 +251,7 @@ impl Handler {
}
}
fn pipeline(&self, frame_id: Option<FrameId>) -> WebDriverResult<PipelineId> {
fn pipeline_id(&self, frame_id: Option<FrameId>) -> WebDriverResult<PipelineId> {
let interval = 20;
let iterations = 30_000 / interval;
let (sender, receiver) = ipc::channel().unwrap();
@ -271,11 +271,11 @@ impl Handler {
}
fn root_pipeline(&self) -> WebDriverResult<PipelineId> {
self.pipeline(None)
self.pipeline_id(None)
}
fn frame_pipeline(&self) -> WebDriverResult<PipelineId> {
self.pipeline(self.session.as_ref().and_then(|session| session.frame_id))
self.pipeline_id(self.session.as_ref().and_then(|session| session.frame_id))
}
fn session(&self) -> WebDriverResult<&WebDriverSession> {