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

Remove mention of some old issues

Browse source 
* #228 was done (confirmed by mbrubeck)
* #2012 fixed TODO item
* servo/webrender#28 (zoom does work)
This commit is contained in:
Pyfisch 2018-01-04 20:31:41 +01:00
parent 3692f13dcb
commit 8a57bff59d
4 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/compositing/compositor.rs
View file

@ -1034,7 +1034,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
} }
} }
// TODO(gw): Support zoom (WR issue #28).
if let Some(combined_event) = last_combined_event { if let Some(combined_event) = last_combined_event {
let scroll_location = match combined_event.scroll_location { let scroll_location = match combined_event.scroll_location {
ScrollLocation::Delta(delta) => { ScrollLocation::Delta(delta) => {

3
components/layout/block.rs
View file

@ -794,7 +794,6 @@ impl BlockFlow {
self.base.floats = Floats::new(self.fragment.style.writing_mode); self.base.floats = Floats::new(self.fragment.style.writing_mode);
} }
let mut margin_collapse_info = MarginCollapseInfo::new();
let writing_mode = self.base.floats.writing_mode; let writing_mode = self.base.floats.writing_mode;
self.base.floats.translate(LogicalSize::new( self.base.floats.translate(LogicalSize::new(
writing_mode, -self.fragment.inline_start_offset(), Au(0))); writing_mode, -self.fragment.inline_start_offset(), Au(0)));
@ -807,7 +806,7 @@ impl BlockFlow {
margins_may_collapse == MarginsMayCollapseFlag::MarginsMayCollapse && margins_may_collapse == MarginsMayCollapseFlag::MarginsMayCollapse &&
!self.base.flags.contains(FlowFlags::IS_ABSOLUTELY_POSITIONED) && !self.base.flags.contains(FlowFlags::IS_ABSOLUTELY_POSITIONED) &&
self.fragment.border_padding.block_start == Au(0); self.fragment.border_padding.block_start == Au(0);
margin_collapse_info.initialize_block_start_margin( let mut margin_collapse_info = MarginCollapseInfo::initialize_block_start_margin(
&self.fragment, &self.fragment,
can_collapse_block_start_margin_with_kids); can_collapse_block_start_margin_with_kids);

2
components/layout/display_list_builder.rs
View file

@ -3566,8 +3566,6 @@ impl InlineFlowDisplayListBuilding for InlineFlow {
} }
fn build_display_list_for_inline(&mut self, state: &mut DisplayListBuildState) { fn build_display_list_for_inline(&mut self, state: &mut DisplayListBuildState) {
// TODO(#228): Once we form lines and have their cached bounds, we can be smarter and
// not recurse on a line if nothing in it can intersect the dirty region.
debug!( debug!(
"Flow: building display list for {} inline fragments", "Flow: building display list for {} inline fragments",
self.fragments.len() self.fragments.len()

24
components/layout/model.rs
View file

@ -111,25 +111,21 @@ pub struct MarginCollapseInfo {
} }
impl MarginCollapseInfo { impl MarginCollapseInfo {
/// TODO(#2012, pcwalton): Remove this method once `fragment` is not an `Option`. pub fn initialize_block_start_margin(
pub fn new() -> MarginCollapseInfo { fragment: &Fragment,
can_collapse_block_start_margin_with_kids: bool,
) -> MarginCollapseInfo {
MarginCollapseInfo { MarginCollapseInfo {
state: MarginCollapseState::AccumulatingCollapsibleTopMargin, state: if can_collapse_block_start_margin_with_kids {
block_start_margin: AdjoiningMargins::new(), MarginCollapseState::AccumulatingCollapsibleTopMargin
} else {
MarginCollapseState::AccumulatingMarginIn
},
block_start_margin: AdjoiningMargins::from_margin(fragment.margin.block_start),
margin_in: AdjoiningMargins::new(), margin_in: AdjoiningMargins::new(),
} }
} }
pub fn initialize_block_start_margin(&mut self,
fragment: &Fragment,
can_collapse_block_start_margin_with_kids: bool) {
if !can_collapse_block_start_margin_with_kids {
self.state = MarginCollapseState::AccumulatingMarginIn
}
self.block_start_margin = AdjoiningMargins::from_margin(fragment.margin.block_start)
}
pub fn finish_and_compute_collapsible_margins(mut self, pub fn finish_and_compute_collapsible_margins(mut self,
fragment: &Fragment, fragment: &Fragment,
containing_block_size: Option<Au>, containing_block_size: Option<Au>,