mirror of
https://github.com/servo/servo.git
synced 2025-07-23 15:23:42 +01:00
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:
commit
3199eace98
1 changed files with 17 additions and 17 deletions
|
@ -134,13 +134,13 @@ impl LayoutRPC for LayoutRPCImpl {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct UnioningFragmentBorderBoxIterator {
|
struct UnioningFragmentBorderBoxIterator {
|
||||||
pub node_address: OpaqueNode,
|
node_address: OpaqueNode,
|
||||||
pub rect: Option<Rect<Au>>,
|
rect: Option<Rect<Au>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl UnioningFragmentBorderBoxIterator {
|
impl UnioningFragmentBorderBoxIterator {
|
||||||
pub fn new(node_address: OpaqueNode) -> UnioningFragmentBorderBoxIterator {
|
fn new(node_address: OpaqueNode) -> UnioningFragmentBorderBoxIterator {
|
||||||
UnioningFragmentBorderBoxIterator {
|
UnioningFragmentBorderBoxIterator {
|
||||||
node_address: node_address,
|
node_address: node_address,
|
||||||
rect: None
|
rect: None
|
||||||
|
@ -165,13 +165,13 @@ impl FragmentBorderBoxIterator for UnioningFragmentBorderBoxIterator {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct CollectingFragmentBorderBoxIterator {
|
struct CollectingFragmentBorderBoxIterator {
|
||||||
pub node_address: OpaqueNode,
|
node_address: OpaqueNode,
|
||||||
pub rects: Vec<Rect<Au>>,
|
rects: Vec<Rect<Au>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl CollectingFragmentBorderBoxIterator {
|
impl CollectingFragmentBorderBoxIterator {
|
||||||
pub fn new(node_address: OpaqueNode) -> CollectingFragmentBorderBoxIterator {
|
fn new(node_address: OpaqueNode) -> CollectingFragmentBorderBoxIterator {
|
||||||
CollectingFragmentBorderBoxIterator {
|
CollectingFragmentBorderBoxIterator {
|
||||||
node_address: node_address,
|
node_address: node_address,
|
||||||
rects: Vec::new(),
|
rects: Vec::new(),
|
||||||
|
@ -189,19 +189,19 @@ impl FragmentBorderBoxIterator for CollectingFragmentBorderBoxIterator {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub enum Side {
|
enum Side {
|
||||||
Left,
|
Left,
|
||||||
Right,
|
Right,
|
||||||
Bottom,
|
Bottom,
|
||||||
Top
|
Top
|
||||||
}
|
}
|
||||||
|
|
||||||
pub enum MarginPadding {
|
enum MarginPadding {
|
||||||
Margin,
|
Margin,
|
||||||
Padding
|
Padding
|
||||||
}
|
}
|
||||||
|
|
||||||
pub enum PositionProperty {
|
enum PositionProperty {
|
||||||
Left,
|
Left,
|
||||||
Right,
|
Right,
|
||||||
Top,
|
Top,
|
||||||
|
@ -210,15 +210,15 @@ pub enum PositionProperty {
|
||||||
Height,
|
Height,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct PositionRetrievingFragmentBorderBoxIterator {
|
struct PositionRetrievingFragmentBorderBoxIterator {
|
||||||
node_address: OpaqueNode,
|
node_address: OpaqueNode,
|
||||||
pub result: Option<Au>,
|
result: Option<Au>,
|
||||||
position: Point2D<Au>,
|
position: Point2D<Au>,
|
||||||
property: PositionProperty,
|
property: PositionProperty,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl PositionRetrievingFragmentBorderBoxIterator {
|
impl PositionRetrievingFragmentBorderBoxIterator {
|
||||||
pub fn new(node_address: OpaqueNode,
|
fn new(node_address: OpaqueNode,
|
||||||
property: PositionProperty,
|
property: PositionProperty,
|
||||||
position: Point2D<Au>) -> PositionRetrievingFragmentBorderBoxIterator {
|
position: Point2D<Au>) -> PositionRetrievingFragmentBorderBoxIterator {
|
||||||
PositionRetrievingFragmentBorderBoxIterator {
|
PositionRetrievingFragmentBorderBoxIterator {
|
||||||
|
@ -252,16 +252,16 @@ impl FragmentBorderBoxIterator for PositionRetrievingFragmentBorderBoxIterator {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct MarginRetrievingFragmentBorderBoxIterator {
|
struct MarginRetrievingFragmentBorderBoxIterator {
|
||||||
node_address: OpaqueNode,
|
node_address: OpaqueNode,
|
||||||
pub result: Option<Au>,
|
result: Option<Au>,
|
||||||
writing_mode: WritingMode,
|
writing_mode: WritingMode,
|
||||||
margin_padding: MarginPadding,
|
margin_padding: MarginPadding,
|
||||||
side: Side,
|
side: Side,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl MarginRetrievingFragmentBorderBoxIterator {
|
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 {
|
MarginPadding, writing_mode: WritingMode) -> MarginRetrievingFragmentBorderBoxIterator {
|
||||||
MarginRetrievingFragmentBorderBoxIterator {
|
MarginRetrievingFragmentBorderBoxIterator {
|
||||||
node_address: node_address,
|
node_address: node_address,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue