diff options
author | bors-servo <release+servo@mozilla.com> | 2014-02-18 16:17:07 -0500 |
---|---|---|
committer | bors-servo <release+servo@mozilla.com> | 2014-02-18 16:17:07 -0500 |
commit | 20bbf6a8596e53c7a27f2489874b81436afb4e6c (patch) | |
tree | c2e2a1fad4b6540a179387f30b343e6ef5aed498 /src/components/main/layout/flow.rs | |
parent | 8b9411270c449f9014e8e39f0c4fb2ae7c11940f (diff) | |
parent | 280b109733dab305196aa897b27c4e1ce2b1e296 (diff) | |
download | servo-20bbf6a8596e53c7a27f2489874b81436afb4e6c.tar.gz servo-20bbf6a8596e53c7a27f2489874b81436afb4e6c.zip |
auto merge of #1693 : lpy/servo/issue1692, r=pcwalton
see #1692
Diffstat (limited to 'src/components/main/layout/flow.rs')
-rw-r--r-- | src/components/main/layout/flow.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/components/main/layout/flow.rs b/src/components/main/layout/flow.rs index e1daba18667..2719885abb8 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, |