aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-12-28 13:49:02 -0800
committerGitHub <noreply@github.com>2016-12-28 13:49:02 -0800
commitc6ea1ec91f4a0b79b4fcdfa05a9b492fa6c9a798 (patch)
tree483b4e8b54a353ecbc6f7a414cc923d534aeec9e
parent149facbb3c6da82d445aa29b694097d451711bbb (diff)
parente3d8131698e34e87325238398c1dd9c8a06dea5d (diff)
downloadservo-c6ea1ec91f4a0b79b4fcdfa05a9b492fa6c9a798.tar.gz
servo-c6ea1ec91f4a0b79b4fcdfa05a9b492fa6c9a798.zip
Auto merge of #14762 - prampey:error-handle, r=jdm
Error handled canvas closing <!-- Please describe your changes on the following line: --> Correctly handled error when Canvas doesn't close properly, with a descriptive warning. --- <!-- 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 #14002 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [X] These changes do not require tests because minor changes don't require tests. <!-- 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/14762) <!-- Reviewable:end -->
-rw-r--r--components/script/dom/canvasrenderingcontext2d.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs
index 32b65439f15..80de3610e89 100644
--- a/components/script/dom/canvasrenderingcontext2d.rs
+++ b/components/script/dom/canvasrenderingcontext2d.rs
@@ -1319,7 +1319,9 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
impl Drop for CanvasRenderingContext2D {
fn drop(&mut self) {
- self.ipc_renderer.send(CanvasMsg::Common(CanvasCommonMsg::Close)).unwrap();
+ if let Err(err) = self.ipc_renderer.send(CanvasMsg::Common(CanvasCommonMsg::Close)) {
+ warn!("Could not close canvas: {}", err)
+ }
}
}