mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-16 23:05:42 +00:00
servo: Merge #19691 - Remove mention of some old issues (from pyfisch:cleanup-issues); r=emilio
* #228 was done (confirmed by mbrubeck) * #2012 fixed TODO item * servo/webrender#28 (zoom does work) <!-- Please describe your changes on the following line: --> See #19685 --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: d1c72fde33338fb2042957c3ccafb31540adee92 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 160f69f3147dd8ecb6471c64080cf73def1c2778
This commit is contained in:
parent
403caf94bf
commit
d50101b22b
@ -1034,7 +1034,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
|
||||
}
|
||||
}
|
||||
|
||||
// TODO(gw): Support zoom (WR issue #28).
|
||||
if let Some(combined_event) = last_combined_event {
|
||||
let scroll_location = match combined_event.scroll_location {
|
||||
ScrollLocation::Delta(delta) => {
|
||||
|
@ -794,7 +794,6 @@ impl BlockFlow {
|
||||
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;
|
||||
self.base.floats.translate(LogicalSize::new(
|
||||
writing_mode, -self.fragment.inline_start_offset(), Au(0)));
|
||||
@ -807,7 +806,7 @@ impl BlockFlow {
|
||||
margins_may_collapse == MarginsMayCollapseFlag::MarginsMayCollapse &&
|
||||
!self.base.flags.contains(FlowFlags::IS_ABSOLUTELY_POSITIONED) &&
|
||||
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,
|
||||
can_collapse_block_start_margin_with_kids);
|
||||
|
||||
|
@ -3566,8 +3566,6 @@ impl InlineFlowDisplayListBuilding for InlineFlow {
|
||||
}
|
||||
|
||||
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!(
|
||||
"Flow: building display list for {} inline fragments",
|
||||
self.fragments.len()
|
||||
|
@ -111,25 +111,21 @@ pub struct MarginCollapseInfo {
|
||||
}
|
||||
|
||||
impl MarginCollapseInfo {
|
||||
/// TODO(#2012, pcwalton): Remove this method once `fragment` is not an `Option`.
|
||||
pub fn new() -> MarginCollapseInfo {
|
||||
pub fn initialize_block_start_margin(
|
||||
fragment: &Fragment,
|
||||
can_collapse_block_start_margin_with_kids: bool,
|
||||
) -> MarginCollapseInfo {
|
||||
MarginCollapseInfo {
|
||||
state: MarginCollapseState::AccumulatingCollapsibleTopMargin,
|
||||
block_start_margin: AdjoiningMargins::new(),
|
||||
state: if can_collapse_block_start_margin_with_kids {
|
||||
MarginCollapseState::AccumulatingCollapsibleTopMargin
|
||||
} else {
|
||||
MarginCollapseState::AccumulatingMarginIn
|
||||
},
|
||||
block_start_margin: AdjoiningMargins::from_margin(fragment.margin.block_start),
|
||||
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,
|
||||
fragment: &Fragment,
|
||||
containing_block_size: Option<Au>,
|
||||
|
Loading…
Reference in New Issue
Block a user