Skip to content

Commit c80bdd9

Browse files
authored
prefs: Remove Opts::nonincremental_layout (servo#43207)
This setting is used to control whether or not incremental legacy layout was enabled. Nowadays incremental layout is always enabled as it is a fundamental feature of how layout works. The setting also controls whether or not nodes are traversed in Style, but that's also something that's much less interesting today. This change just removes this setting as it just controls the Stylo setting. A corresponding change in Stylo will also remove the setting there. Testing: This just removes a setting so existing tests should suffice. Fixes: This is part of servo#34967. Signed-off-by: Martin Robinson <mrobinson@igalia.com>
1 parent eabf3c7 commit c80bdd9

File tree

4 files changed

+2
-12
lines changed

4 files changed

+2
-12
lines changed

components/config/opts.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ pub struct Opts {
2727
/// visualizing the traces as a timeline.
2828
pub time_profiler_trace_path: Option<String>,
2929

30-
/// True to turn off incremental layout.
31-
pub nonincremental_layout: bool,
32-
3330
/// True to exit on thread failure instead of displaying about:failure.
3431
pub hard_fail: bool,
3532

@@ -215,7 +212,6 @@ impl Default for Opts {
215212
Self {
216213
time_profiling: None,
217214
time_profiler_trace_path: None,
218-
nonincremental_layout: false,
219215
hard_fail: true,
220216
multiprocess: false,
221217
force_ipc: false,

components/script/dom/node.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4742,6 +4742,8 @@ impl VirtualMethods for Node {
47424742
.drain_to_parent(old_parent, context.index(), self);
47434743
}
47444744
}
4745+
4746+
self.owner_doc().content_and_heritage_changed(self);
47454747
}
47464748

47474749
fn handle_event(&self, event: &Event, can_gc: CanGc) {

components/servo/servo.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -742,8 +742,6 @@ impl Servo {
742742
);
743743
style::context::DEFAULT_DUMP_STYLE_STATISTICS
744744
.store(opts.debug.style_statistics, Ordering::Relaxed);
745-
style::traversal::IS_SERVO_NONINCREMENTAL_LAYOUT
746-
.store(opts.nonincremental_layout, Ordering::Relaxed);
747745

748746
if !opts.multiprocess {
749747
media_platform::init();

ports/servoshell/prefs.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -464,11 +464,6 @@ struct CmdArgs {
464464
#[bpaf(short('b'), long)]
465465
no_native_titlebar: bool,
466466

467-
///
468-
/// Enable to turn off incremental layout.
469-
#[bpaf(short('i'), long, flag(false, true))]
470-
nonincremental_layout: bool,
471-
472467
/// Path to an output image. The format of the image is determined by the extension.
473468
/// Supports all formats that `rust-image` does.
474469
#[bpaf(short('o'), argument("test.png"), long)]
@@ -722,7 +717,6 @@ fn parse_arguments_helper(args_without_binary: Args) -> ArgumentParsingResult {
722717
time_profiler_trace_path: cmd_args
723718
.profiler_trace_path
724719
.map(|p| p.to_string_lossy().into_owned()),
725-
nonincremental_layout: cmd_args.nonincremental_layout,
726720
hard_fail: cmd_args.hard_fail,
727721
multiprocess: cmd_args.multiprocess,
728722
background_hang_monitor: cmd_args.background_hang_monitor,

0 commit comments

Comments
 (0)