mirror of
https://github.com/servo/servo.git
synced 2025-08-07 14:35:33 +01:00
Auto merge of #16757 - zombiefungus:issue16716, r=KiChjang
Remove obsolete paint threads option #16716 <!-- Please describe your changes on the following line: --> Remove paint_threads from `ports/cef/core.rs` and `components/config/opts.rs` --- <!-- 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 - [x] These changes fix #16716 <!-- 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. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16757) <!-- Reviewable:end -->
This commit is contained in:
commit
c171ded902
2 changed files with 0 additions and 15 deletions
|
@ -32,11 +32,6 @@ pub struct Opts {
|
||||||
/// The initial URL to load.
|
/// The initial URL to load.
|
||||||
pub url: Option<ServoUrl>,
|
pub url: Option<ServoUrl>,
|
||||||
|
|
||||||
/// How many threads to use for CPU painting (`-t`).
|
|
||||||
///
|
|
||||||
/// Note that painting is sequentialized when using GPU painting.
|
|
||||||
pub paint_threads: usize,
|
|
||||||
|
|
||||||
/// The maximum size of each tile in pixels (`-s`).
|
/// The maximum size of each tile in pixels (`-s`).
|
||||||
pub tile_size: usize,
|
pub tile_size: usize,
|
||||||
|
|
||||||
|
@ -504,7 +499,6 @@ pub fn default_opts() -> Opts {
|
||||||
Opts {
|
Opts {
|
||||||
is_running_problem_test: false,
|
is_running_problem_test: false,
|
||||||
url: Some(ServoUrl::parse("about:blank").unwrap()),
|
url: Some(ServoUrl::parse("about:blank").unwrap()),
|
||||||
paint_threads: 1,
|
|
||||||
tile_size: 512,
|
tile_size: 512,
|
||||||
device_pixels_per_px: None,
|
device_pixels_per_px: None,
|
||||||
time_profiling: None,
|
time_profiling: None,
|
||||||
|
@ -693,12 +687,6 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult {
|
||||||
.unwrap_or_else(|err| args_fail(&format!("Error parsing option: --device-pixel-ratio ({})", err)))
|
.unwrap_or_else(|err| args_fail(&format!("Error parsing option: --device-pixel-ratio ({})", err)))
|
||||||
);
|
);
|
||||||
|
|
||||||
let mut paint_threads: usize = match opt_match.opt_str("t") {
|
|
||||||
Some(paint_threads_str) => paint_threads_str.parse()
|
|
||||||
.unwrap_or_else(|err| args_fail(&format!("Error parsing option: -t ({})", err))),
|
|
||||||
None => cmp::max(num_cpus::get() * 3 / 4, 1),
|
|
||||||
};
|
|
||||||
|
|
||||||
// If only the flag is present, default to a 5 second period for both profilers
|
// If only the flag is present, default to a 5 second period for both profilers
|
||||||
let time_profiling = if opt_match.opt_present("p") {
|
let time_profiling = if opt_match.opt_present("p") {
|
||||||
match opt_match.opt_str("p") {
|
match opt_match.opt_str("p") {
|
||||||
|
@ -748,7 +736,6 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult {
|
||||||
|
|
||||||
let mut bubble_inline_sizes_separately = debug_options.bubble_widths;
|
let mut bubble_inline_sizes_separately = debug_options.bubble_widths;
|
||||||
if debug_options.trace_layout {
|
if debug_options.trace_layout {
|
||||||
paint_threads = 1;
|
|
||||||
layout_threads = Some(1);
|
layout_threads = Some(1);
|
||||||
bubble_inline_sizes_separately = true;
|
bubble_inline_sizes_separately = true;
|
||||||
}
|
}
|
||||||
|
@ -809,7 +796,6 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult {
|
||||||
let opts = Opts {
|
let opts = Opts {
|
||||||
is_running_problem_test: is_running_problem_test,
|
is_running_problem_test: is_running_problem_test,
|
||||||
url: Some(url),
|
url: Some(url),
|
||||||
paint_threads: paint_threads,
|
|
||||||
tile_size: tile_size,
|
tile_size: tile_size,
|
||||||
device_pixels_per_px: device_pixels_per_px,
|
device_pixels_per_px: device_pixels_per_px,
|
||||||
time_profiling: time_profiling,
|
time_profiling: time_profiling,
|
||||||
|
|
|
@ -68,7 +68,6 @@ pub extern "C" fn cef_initialize(args: *const cef_main_args_t,
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut temp_opts = opts::default_opts();
|
let mut temp_opts = opts::default_opts();
|
||||||
temp_opts.paint_threads = rendering_threads;
|
|
||||||
temp_opts.headless = false;
|
temp_opts.headless = false;
|
||||||
temp_opts.hard_fail = false;
|
temp_opts.hard_fail = false;
|
||||||
temp_opts.enable_text_antialiasing = true;
|
temp_opts.enable_text_antialiasing = true;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue