aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlpy <pylaurent1314@gmail.com>2014-02-14 16:41:00 +0800
committerlpy <pylaurent1314@gmail.com>2014-02-14 17:02:03 +0800
commit280b109733dab305196aa897b27c4e1ce2b1e296 (patch)
treec1e3352c261afdf0872557c063b2722871ca7f6b
parentf1de0b738134f153a398866f76d1b5d0213d3c02 (diff)
downloadservo-280b109733dab305196aa897b27c4e1ce2b1e296.tar.gz
servo-280b109733dab305196aa897b27c4e1ce2b1e296.zip
Rename starts_*_flow to is_*_flow
-rw-r--r--src/components/main/layout/block.rs4
-rw-r--r--src/components/main/layout/flow.rs14
2 files changed, 9 insertions, 9 deletions
diff --git a/src/components/main/layout/block.rs b/src/components/main/layout/block.rs
index 89415f45745..867d6734b07 100644
--- a/src/components/main/layout/block.rs
+++ b/src/components/main/layout/block.rs
@@ -650,7 +650,7 @@ impl Flow for BlockFlow {
/* find max width from child block contexts */
for child_ctx in self.base.child_iter() {
- assert!(child_ctx.starts_block_flow() || child_ctx.starts_inline_flow());
+ assert!(child_ctx.is_block_flow() || child_ctx.is_inline_flow());
let child_base = flow::mut_base(child_ctx);
min_width = geometry::max(min_width, child_base.min_width);
@@ -781,7 +781,7 @@ impl Flow for BlockFlow {
// FIXME(ksh8281): avoid copy
let flags_info = self.base.flags_info.clone();
for kid in self.base.child_iter() {
- assert!(kid.starts_block_flow() || kid.starts_inline_flow());
+ assert!(kid.is_block_flow() || kid.is_inline_flow());
let child_base = flow::mut_base(kid);
child_base.position.origin.x = x_offset;
diff --git a/src/components/main/layout/flow.rs b/src/components/main/layout/flow.rs
index db38b3327ce..08b3f086675 100644
--- a/src/components/main/layout/flow.rs
+++ b/src/components/main/layout/flow.rs
@@ -171,11 +171,11 @@ pub trait ImmutableFlowUtils {
/// Return true if this flow is a Block Container.
fn is_block_container(self) -> bool;
- /// Returns true if this flow is a block flow, an inline flow, or a float flow.
- fn starts_block_flow(self) -> bool;
+ /// Returns true if this flow is a block flow.
+ fn is_block_flow(self) -> bool;
/// Returns true if this flow is an inline flow.
- fn starts_inline_flow(self) -> bool;
+ fn is_inline_flow(self) -> bool;
/// Dumps the flow tree for debugging.
fn dump(self);
@@ -633,16 +633,16 @@ impl<'a> ImmutableFlowUtils for &'a Flow {
}
}
- /// Returns true if this flow is a block flow, an inline-block flow, or a float flow.
- fn starts_block_flow(self) -> bool {
+ /// Returns true if this flow is a block flow.
+ fn is_block_flow(self) -> bool {
match self.class() {
BlockFlowClass => true,
InlineFlowClass => false,
}
}
- /// Returns true if this flow is a block flow, an inline flow, or a float flow.
- fn starts_inline_flow(self) -> bool {
+ /// Returns true if this flow is an inline flow.
+ fn is_inline_flow(self) -> bool {
match self.class() {
InlineFlowClass => true,
BlockFlowClass => false,