Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

layout: Skip layout traversals that obviously won't do anything. #10021

Merged
merged 6 commits into from Mar 21, 2016
+72 −57
Merged

layout: Skip layout traversals that obviously won't do anything. #10021

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
21ea8ee
layout: Make transform changes require incremental repaint.
pcwalton Mar 16, 2016
5dca005
layout: Repaint when `z-index` is modified.
pcwalton Mar 21, 2016
acfd8e4
layout: Don't rebuild display lists at all unless restyling tells us
pcwalton Mar 15, 2016
7cb9429
layout: Don't start the reflow pass unless some node needs to be
pcwalton Mar 15, 2016
ed6ee29
script: Don't paint layouts induced by hit test queries.
pcwalton Mar 15, 2016
7a131ba
layout: Minor whitespace cleanup.
pcwalton Mar 15, 2016
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

4 components/layout/incremental.rs
View file
Open in desktop
@@ -167,7 +167,8 @@ pub fn compute_damage(old: Option<&Arc<ComputedValues>>, new: &ComputedValues) -
[ REPAINT ], [
get_color.color, get_background.background_color,
get_border.border_top_color, get_border.border_right_color,
get_border.border_bottom_color, get_border.border_left_color
get_border.border_bottom_color, get_border.border_left_color,
get_effects.transform, get_box.z_index
]);

add_if_not_equal!(old, new, damage,
@@ -252,7 +253,6 @@ impl<'a> LayoutDamageComputation for &'a mut Flow {
has_counter_affecting_children = has_counter_affecting_children ||
flow::base(kid).flags.intersects(AFFECTS_COUNTERS |
HAS_COUNTER_AFFECTING_CHILDREN);

}
}

115 components/layout/layout_thread.rs
View file
Open in desktop
@@ -30,7 +30,8 @@ use gfx::font_context;
use gfx::paint_thread::LayoutToPaintMsg;
use gfx_traits::{color, Epoch, LayerId, ScrollPolicy};
use heapsize::HeapSizeOf;
use incremental::{LayoutDamageComputation, REFLOW, REFLOW_ENTIRE_DOCUMENT, REPAINT};
use incremental::{LayoutDamageComputation, REFLOW, REFLOW_ENTIRE_DOCUMENT, REFLOW_OUT_OF_FLOW};
use incremental::{REPAINT};
use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
use ipc_channel::router::ROUTER;
use layout_debug;
@@ -869,26 +870,27 @@ impl LayoutThread {
flow::mut_base(flow_ref::deref_mut(layout_root)).clip =
ClippingRegion::from_rect(&data.page_clip_rect);

let mut root_stacking_context =
StackingContext::new(StackingContextId::new(0),
StackingContextType::Real,
&Rect::zero(),
&Rect::zero(),
0,
filter::T::new(Vec::new()),
mix_blend_mode::T::normal,
Matrix4::identity(),
Matrix4::identity(),
true,
false,
None);

let display_list_entries =
sequential::build_display_list_for_subtree(layout_root,
&mut root_stacking_context,
shared_layout_context);
if flow::base(&**layout_root).restyle_damage.contains(REPAINT) ||
rw_data.display_list.is_none() {
let mut root_stacking_context =
StackingContext::new(StackingContextId::new(0),
StackingContextType::Real,
&Rect::zero(),
&Rect::zero(),
0,
filter::T::new(Vec::new()),
mix_blend_mode::T::normal,
Matrix4::identity(),
Matrix4::identity(),
true,
false,
None);

let display_list_entries =
sequential::build_display_list_for_subtree(layout_root,
&mut root_stacking_context,
shared_layout_context);

if data.goal == ReflowGoal::ForDisplay {
debug!("Done building display list.");

let root_background_color = get_root_flow_background_color(
@@ -905,23 +907,27 @@ impl LayoutThread {
let origin = Rect::new(Point2D::new(Au(0), Au(0)), root_size);
root_stacking_context.bounds = origin;
root_stacking_context.overflow = origin;
root_stacking_context.layer_info = Some(LayerInfo::new(layout_root.layer_id(),
ScrollPolicy::Scrollable,
None,
root_background_color));
root_stacking_context.layer_info =
Some(LayerInfo::new(layout_root.layer_id(),
ScrollPolicy::Scrollable,
None,
root_background_color));

rw_data.display_list =
Some(Arc::new(DisplayList::new(root_stacking_context,
&mut Some(display_list_entries))))
}

if data.goal == ReflowGoal::ForDisplay {
let display_list = (*rw_data.display_list.as_ref().unwrap()).clone();

let display_list = DisplayList::new(root_stacking_context,
&mut Some(display_list_entries));
if opts::get().dump_display_list {
display_list.print();
}
if opts::get().dump_display_list_json {
println!("{}", serde_json::to_string_pretty(&display_list).unwrap());
}

let display_list = Arc::new(display_list);
rw_data.display_list = Some(display_list.clone());

debug!("Layout done!");

self.epoch.next();
@@ -942,10 +948,13 @@ impl LayoutThread {
epoch,
Some(root_scroll_layer_id),
&mut auxiliary_lists_builder);
let root_background_color = webrender_traits::ColorF::new(root_background_color.r,
root_background_color.g,
root_background_color.b,
root_background_color.a);
let root_background_color = get_root_flow_background_color(
flow_ref::deref_mut(layout_root));
let root_background_color =
webrender_traits::ColorF::new(root_background_color.r,
root_background_color.g,
root_background_color.b,
root_background_color.a);

let viewport_size = Size2D::new(self.viewport_size.width.to_f32_px(),
self.viewport_size.height.to_f32_px());
@@ -1323,26 +1332,28 @@ impl LayoutThread {

// Perform the primary layout passes over the flow tree to compute the locations of all
// the boxes.
profile(time::ProfilerCategory::LayoutMain,
self.profiler_metadata(),
self.time_profiler_chan.clone(),
|| {
let profiler_metadata = self.profiler_metadata();
match self.parallel_traversal {
None => {
// Sequential mode.
LayoutThread::solve_constraints(&mut root_flow, &layout_context)
}
Some(ref mut parallel) => {
// Parallel mode.
LayoutThread::solve_constraints_parallel(parallel,
&mut root_flow,
profiler_metadata,
self.time_profiler_chan.clone(),
&*layout_context);
if flow::base(&*root_flow).restyle_damage.intersects(REFLOW | REFLOW_OUT_OF_FLOW) {
profile(time::ProfilerCategory::LayoutMain,
self.profiler_metadata(),
self.time_profiler_chan.clone(),
|| {
let profiler_metadata = self.profiler_metadata();
match self.parallel_traversal {
None => {
// Sequential mode.
LayoutThread::solve_constraints(&mut root_flow, &layout_context)
}
Some(ref mut parallel) => {
// Parallel mode.
LayoutThread::solve_constraints_parallel(parallel,
&mut root_flow,
profiler_metadata,
self.time_profiler_chan.clone(),
&*layout_context);
}
}
}
});
});
}

profile(time::ProfilerCategory::LayoutStoreOverflow,
self.profiler_metadata(),
2 components/layout/traversal.rs
View file
Open in desktop
@@ -234,6 +234,6 @@ impl<'a> BuildDisplayList<'a> {

#[inline]
fn should_process(&self) -> bool {

This comment has been minimized.

Sign in to view
@Ms2ger

Ms2ger Mar 16, 2016

Contributor

Remove?
self.state.layout_context.shared_context().goal == ReflowGoal::ForDisplay
true
}
}
8 components/script/dom/window.rs
View file
Open in desktop
@@ -1021,7 +1021,11 @@ impl Window {

debug!("script: layout joined");

self.pending_reflow_count.set(0);
// Pending reflows require display, so only reset the pending reflow count if this reflow
// was to be displayed.
if goal == ReflowGoal::ForDisplay {
self.pending_reflow_count.set(0);
}

if let Some(marker) = marker {
self.emit_timeline_marker(marker.end());
@@ -1104,7 +1108,7 @@ impl Window {

pub fn hit_test_query(&self, hit_test_request: Point2D<f32>, update_cursor: bool)
-> Option<UntrustedNodeAddress> {
self.reflow(ReflowGoal::ForDisplay,
self.reflow(ReflowGoal::ForScriptQuery,
ReflowQueryType::HitTestQuery(hit_test_request, update_cursor),
ReflowReason::Query);
self.layout_rpc.hit_test().node_address
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.