Auto merge of #8642 - jmr0:master, r=jdm

making internal pub enums, functions, and structs private

Refactoring to fix #8620

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8642)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-22 16:15:36 +05:30
commit 3199eace98

View file

@ -134,13 +134,13 @@ impl LayoutRPC for LayoutRPCImpl {
}
}
pub struct UnioningFragmentBorderBoxIterator {
pub node_address: OpaqueNode,
pub rect: Option<Rect<Au>>,
struct UnioningFragmentBorderBoxIterator {
node_address: OpaqueNode,
rect: Option<Rect<Au>>,
}
impl UnioningFragmentBorderBoxIterator {
pub fn new(node_address: OpaqueNode) -> UnioningFragmentBorderBoxIterator {
fn new(node_address: OpaqueNode) -> UnioningFragmentBorderBoxIterator {
UnioningFragmentBorderBoxIterator {
node_address: node_address,
rect: None
@ -165,13 +165,13 @@ impl FragmentBorderBoxIterator for UnioningFragmentBorderBoxIterator {
}
}
pub struct CollectingFragmentBorderBoxIterator {
pub node_address: OpaqueNode,
pub rects: Vec<Rect<Au>>,
struct CollectingFragmentBorderBoxIterator {
node_address: OpaqueNode,
rects: Vec<Rect<Au>>,
}
impl CollectingFragmentBorderBoxIterator {
pub fn new(node_address: OpaqueNode) -> CollectingFragmentBorderBoxIterator {
fn new(node_address: OpaqueNode) -> CollectingFragmentBorderBoxIterator {
CollectingFragmentBorderBoxIterator {
node_address: node_address,
rects: Vec::new(),
@ -189,19 +189,19 @@ impl FragmentBorderBoxIterator for CollectingFragmentBorderBoxIterator {
}
}
pub enum Side {
enum Side {
Left,
Right,
Bottom,
Top
}
pub enum MarginPadding {
enum MarginPadding {
Margin,
Padding
}
pub enum PositionProperty {
enum PositionProperty {
Left,
Right,
Top,
@ -210,15 +210,15 @@ pub enum PositionProperty {
Height,
}
pub struct PositionRetrievingFragmentBorderBoxIterator {
struct PositionRetrievingFragmentBorderBoxIterator {
node_address: OpaqueNode,
pub result: Option<Au>,
result: Option<Au>,
position: Point2D<Au>,
property: PositionProperty,
}
impl PositionRetrievingFragmentBorderBoxIterator {
pub fn new(node_address: OpaqueNode,
fn new(node_address: OpaqueNode,
property: PositionProperty,
position: Point2D<Au>) -> PositionRetrievingFragmentBorderBoxIterator {
PositionRetrievingFragmentBorderBoxIterator {
@ -252,16 +252,16 @@ impl FragmentBorderBoxIterator for PositionRetrievingFragmentBorderBoxIterator {
}
}
pub struct MarginRetrievingFragmentBorderBoxIterator {
struct MarginRetrievingFragmentBorderBoxIterator {
node_address: OpaqueNode,
pub result: Option<Au>,
result: Option<Au>,
writing_mode: WritingMode,
margin_padding: MarginPadding,
side: Side,
}
impl MarginRetrievingFragmentBorderBoxIterator {
pub fn new(node_address: OpaqueNode, side: Side, margin_padding:
fn new(node_address: OpaqueNode, side: Side, margin_padding:
MarginPadding, writing_mode: WritingMode) -> MarginRetrievingFragmentBorderBoxIterator {
MarginRetrievingFragmentBorderBoxIterator {
node_address: node_address,