aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-06-10 10:06:29 -0500
committerGitHub <noreply@github.com>2016-06-10 10:06:29 -0500
commit2fb8525919a72a1e1d5c873fb18a97c67c93bd95 (patch)
tree3952ad4c2ceaa967b4891c20a37c9c3df088852a
parent96f34049286076c20ff91b260eb6a9651c0eecd6 (diff)
parenta3ef9ae42238879a43871b791c14fd917b477d07 (diff)
downloadservo-2fb8525919a72a1e1d5c873fb18a97c67c93bd95.tar.gz
servo-2fb8525919a72a1e1d5c873fb18a97c67c93bd95.zip
Auto merge of #11707 - jdm:resize_warn, r=Ms2ger
Avoid frequent intermittent failure in tests. - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #11613 (github issue number if applicable). - [X] These changes do not require tests because they address a frequent nondeterministic panic that occurs in other tests. <!-- 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/11707) <!-- Reviewable:end -->
-rw-r--r--components/script/script_thread.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index eec1853239e..51460cd4bb9 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -1087,7 +1087,7 @@ impl ScriptThread {
load.window_size = Some(size);
return;
}
- panic!("resize sent to nonexistent pipeline");
+ warn!("resize sent to nonexistent pipeline");
}
fn handle_viewport(&self, id: PipelineId, rect: Rect<f32>) {