Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rustfmt components/layout/display_list/

Browse source
This commit is contained in:
Pyfisch 2018-05-05 22:18:31 +02:00
parent 4b3ccc7c8c
commit ee38fd6f0a
2 changed files with 44 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/layout/display_list/background.rs
View file

@ -813,10 +813,7 @@ pub fn build_image_border_details(
} }
} }
fn calculate_border_image_outset_side( fn calculate_border_image_outset_side(outset: LengthOrNumber, border_width: Au) -> Au {
outset: LengthOrNumber,
border_width: Au,
) -> Au {
match outset { match outset {
Either::First(length) => length.into(), Either::First(length) => length.into(),
Either::Second(factor) => border_width.scale_by(factor), Either::Second(factor) => border_width.scale_by(factor),

82
components/layout/display_list/builder.rs
View file

@ -1253,10 +1253,8 @@ impl FragmentDisplayListBuilding for Fragment {
let border_radius = build_border_radius(bounds, border_style_struct); let border_radius = build_border_radius(bounds, border_style_struct);
let border_widths = border.to_physical(style.writing_mode); let border_widths = border.to_physical(style.writing_mode);
let outset = calculate_border_image_outset( let outset =
border_style_struct.border_image_outset, calculate_border_image_outset(border_style_struct.border_image_outset, border_widths);
border_widths
);
let outset_layout = SideOffsets2D::new( let outset_layout = SideOffsets2D::new(
outset.top.to_f32_px(), outset.top.to_f32_px(),
outset.right.to_f32_px(), outset.right.to_f32_px(),
@ -1285,36 +1283,34 @@ impl FragmentDisplayListBuilding for Fragment {
}, },
radius: border_radius, radius: border_radius,
})), })),
Either::Second(Image::Gradient(ref gradient)) => { Either::Second(Image::Gradient(ref gradient)) => Some(match gradient.kind {
Some(match gradient.kind { GradientKind::Linear(angle_or_corner) => BorderDetails::Gradient(GradientBorder {
GradientKind::Linear(angle_or_corner) => { gradient: convert_linear_gradient(
BorderDetails::Gradient(GradientBorder { bounds.size,
gradient: convert_linear_gradient( &gradient.items[..],
bounds.size, angle_or_corner,
&gradient.items[..], gradient.repeating,
angle_or_corner, ),
gradient.repeating, outset: outset_layout,
), }),
outset: outset_layout, GradientKind::Radial(shape, center, _angle) => {
}) BorderDetails::RadialGradient(RadialGradientBorder {
}, gradient: convert_radial_gradient(
GradientKind::Radial(shape, center, _angle) => { bounds.size,
BorderDetails::RadialGradient(RadialGradientBorder { &gradient.items[..],
gradient: convert_radial_gradient( shape,
bounds.size, center,
&gradient.items[..], gradient.repeating,
shape, ),
center, outset: outset_layout,
gradient.repeating, })
), },
outset: outset_layout, }),
})
},
})
},
Either::Second(Image::PaintWorklet(ref paint_worklet)) => { Either::Second(Image::PaintWorklet(ref paint_worklet)) => {
self.get_webrender_image_for_paint_worklet(state, style, paint_worklet, size) self.get_webrender_image_for_paint_worklet(state, style, paint_worklet, size)
.and_then(|image| build_image_border_details(image, border_style_struct, outset_layout)) .and_then(|image| {
build_image_border_details(image, border_style_struct, outset_layout)
})
}, },
Either::Second(Image::Rect(..)) => { Either::Second(Image::Rect(..)) => {
// TODO: Handle border-image with `-moz-image-rect`. // TODO: Handle border-image with `-moz-image-rect`.
@ -1333,7 +1329,9 @@ impl FragmentDisplayListBuilding for Fragment {
UsePlaceholder::No, UsePlaceholder::No,
) )
}) })
.and_then(|image| build_image_border_details(image, border_style_struct, outset_layout)), .and_then(|image| {
build_image_border_details(image, border_style_struct, outset_layout)
}),
}; };
if let Some(details) = details { if let Some(details) = details {
state.add_display_item(DisplayItem::Border(Box::new(BorderDisplayItem { state.add_display_item(DisplayItem::Border(Box::new(BorderDisplayItem {
@ -1838,8 +1836,10 @@ impl FragmentDisplayListBuilding for Fragment {
let ipc_renderer = ipc_renderer.lock().unwrap(); let ipc_renderer = ipc_renderer.lock().unwrap();
let (sender, receiver) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap();
ipc_renderer ipc_renderer
.send(CanvasMsg::FromLayout(FromLayoutMsg::SendData(sender), .send(CanvasMsg::FromLayout(
canvas_fragment_info.canvas_id.clone())) FromLayoutMsg::SendData(sender),
canvas_fragment_info.canvas_id.clone(),
))
.unwrap(); .unwrap();
receiver.recv().unwrap().image_key receiver.recv().unwrap().image_key
}, },
@ -2327,9 +2327,7 @@ impl BlockFlowDisplayListBuilding for BlockFlow {
} }
if let Some(clip) = state.containing_block_clip_stack.last().cloned() { if let Some(clip) = state.containing_block_clip_stack.last().cloned() {
state state.containing_block_clip_stack.push(transform_clip(clip));
.containing_block_clip_stack
.push(transform_clip(clip));
preserved_state.containing_block_clips_pushed += 1; preserved_state.containing_block_clips_pushed += 1;
} }
} }
@ -2999,7 +2997,13 @@ impl ComputedValuesCursorUtility for ComputedValues {
&self.get_pointing().cursor, &self.get_pointing().cursor,
) { ) {
(PointerEvents::None, _) => None, (PointerEvents::None, _) => None,
(PointerEvents::Auto, &Cursor { keyword: CursorKind::Auto, .. }) => Some(default_cursor), (
PointerEvents::Auto,
&Cursor {
keyword: CursorKind::Auto,
..
},
) => Some(default_cursor),
(PointerEvents::Auto, &Cursor { keyword, .. }) => Some(keyword), (PointerEvents::Auto, &Cursor { keyword, .. }) => Some(keyword),
} }
} }