Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 22:45:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #8679 - jdm:rmprintln, r=larsbergstrom

Browse source 
Fix #8502 by not printing the message which is known to be repeated m…

…illions of times.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8679)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-27 03:26:35 +05:30
commit 3614ed74d9
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/compositing/compositor.rs
View file

@ -55,14 +55,14 @@ use util::opts;
use util::print_tree::PrintTree; use util::print_tree::PrintTree;
use windowing::{self, MouseWindowEvent, WindowEvent, WindowMethods, WindowNavigateMsg}; use windowing::{self, MouseWindowEvent, WindowEvent, WindowMethods, WindowNavigateMsg};
#[derive(Debug)] #[derive(Debug, PartialEq)]
enum UnableToComposite { enum UnableToComposite {
NoContext, NoContext,
WindowUnprepared, WindowUnprepared,
NotReadyToPaintImage(NotReadyToPaint), NotReadyToPaintImage(NotReadyToPaint),
} }
#[derive(Debug)] #[derive(Debug, PartialEq)]
enum NotReadyToPaint { enum NotReadyToPaint {
LayerHasOutstandingPaintMessages, LayerHasOutstandingPaintMessages,
MissingRoot, MissingRoot,
@ -1770,7 +1770,10 @@ impl<Window: WindowMethods> IOCompositor<Window> {
(opts::get().output_file.is_some() || opts::get().exit_after_load) { (opts::get().output_file.is_some() || opts::get().exit_after_load) {
println!("Shutting down the Constellation after generating an output file or exit flag specified"); println!("Shutting down the Constellation after generating an output file or exit flag specified");
self.start_shutting_down(); self.start_shutting_down();
} else if composited.is_err() && opts::get().is_running_problem_test { } else if composited.is_err() &&
opts::get().is_running_problem_test &&
composited.as_ref().err().unwrap() != &UnableToComposite::NotReadyToPaintImage(
NotReadyToPaint::WaitingOnConstellation) {
println!("not ready to composite: {:?}", composited.err().unwrap()); println!("not ready to composite: {:?}", composited.err().unwrap());
} }
} }