mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Auto merge of #11752 - mbrubeck:cleanup, r=pcwalton
Minor code cleanup in layout r? @pcwalton <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11752) <!-- Reviewable:end -->
This commit is contained in:
commit
47387a5c44
4 changed files with 6 additions and 9 deletions
|
@ -49,7 +49,7 @@ use layout_debug;
|
|||
use model::{CollapsibleMargins, MaybeAuto, specified, specified_or_none};
|
||||
use model::{self, IntrinsicISizes, MarginCollapseInfo};
|
||||
use rustc_serialize::{Encodable, Encoder};
|
||||
use script_layout_interface::restyle_damage::{BUBBLE_ISIZES, REFLOW, REFLOW_OUT_OF_FLOW, REPAINT};
|
||||
use script_layout_interface::restyle_damage::{BUBBLE_ISIZES, REFLOW, REFLOW_OUT_OF_FLOW};
|
||||
use std::cmp::{max, min};
|
||||
use std::fmt;
|
||||
use std::sync::Arc;
|
||||
|
@ -2136,7 +2136,6 @@ impl Flow for BlockFlow {
|
|||
|
||||
fn build_display_list(&mut self, state: &mut DisplayListBuildState) {
|
||||
self.build_display_list_for_block(state, BorderPaintingMode::Separate);
|
||||
self.fragment.restyle_damage.remove(REPAINT);
|
||||
}
|
||||
|
||||
fn repair_style(&mut self, new_style: &Arc<ServoComputedValues>) {
|
||||
|
|
|
@ -38,6 +38,7 @@ use model::{self, MaybeAuto, ToGfxMatrix};
|
|||
use net_traits::image::base::PixelFormat;
|
||||
use net_traits::image_cache_thread::UsePlaceholder;
|
||||
use range::Range;
|
||||
use script_layout_interface::restyle_damage::REPAINT;
|
||||
use std::default::Default;
|
||||
use std::sync::Arc;
|
||||
use std::{cmp, f32};
|
||||
|
@ -1011,6 +1012,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
|||
display_list_section: DisplayListSection,
|
||||
clip: &ClippingRegion,
|
||||
stacking_relative_display_port: &Rect<Au>) {
|
||||
self.restyle_damage.remove(REPAINT);
|
||||
if self.style().get_inheritedbox().visibility != visibility::T::visible {
|
||||
return
|
||||
}
|
||||
|
|
|
@ -24,8 +24,8 @@ use gfx_traits::StackingContextId;
|
|||
use layout_debug;
|
||||
use model::IntrinsicISizesContribution;
|
||||
use range::{Range, RangeIndex};
|
||||
use script_layout_interface::restyle_damage::{BUBBLE_ISIZES, REFLOW, REFLOW_OUT_OF_FLOW};
|
||||
use script_layout_interface::restyle_damage::{REPAINT, RESOLVE_GENERATED_CONTENT};
|
||||
use script_layout_interface::restyle_damage::{BUBBLE_ISIZES, REFLOW};
|
||||
use script_layout_interface::restyle_damage::{REFLOW_OUT_OF_FLOW, RESOLVE_GENERATED_CONTENT};
|
||||
use script_layout_interface::wrapper_traits::PseudoElementType;
|
||||
use std::cmp::max;
|
||||
use std::collections::VecDeque;
|
||||
|
@ -1642,10 +1642,6 @@ impl Flow for InlineFlow {
|
|||
|
||||
fn build_display_list(&mut self, state: &mut DisplayListBuildState) {
|
||||
self.build_display_list_for_inline(state);
|
||||
|
||||
for fragment in &mut self.fragments.fragments {
|
||||
fragment.restyle_damage.remove(REPAINT);
|
||||
}
|
||||
}
|
||||
|
||||
fn repair_style(&mut self, _: &Arc<ServoComputedValues>) {}
|
||||
|
|
|
@ -135,7 +135,7 @@ impl TableFlow {
|
|||
|
||||
/// Updates the minimum and preferred inline-size calculation for a single row. This is
|
||||
/// factored out into a separate function because we process children of rowgroups too.
|
||||
fn update_column_inline_sizes_for_row(row: &mut TableRowFlow,
|
||||
fn update_column_inline_sizes_for_row(row: &TableRowFlow,
|
||||
column_inline_sizes: &mut Vec<ColumnIntrinsicInlineSize>,
|
||||
computation: &mut IntrinsicISizesContribution,
|
||||
first_row: bool,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue