diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-10-04 16:01:40 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-04 16:01:40 -0500 |
commit | 318b23ed0047cc39625ca2f33a55d647b5886019 (patch) | |
tree | 811eee2c355098c02d183abb11b02c863e97ae88 /components/script/dom/svggraphicselement.rs | |
parent | 19a5a30113c3b58d69b6010c79db35b9bd8978c9 (diff) | |
parent | 432580bd043c402fad1a1dd428c2921b27456b05 (diff) | |
download | servo-318b23ed0047cc39625ca2f33a55d647b5886019.tar.gz servo-318b23ed0047cc39625ca2f33a55d647b5886019.zip |
Auto merge of #13472 - asajeffrey:util-remutex-dont-log-while-mutating-lock, r=jdm
Don't log in the middle of mutating a reentrant lock
<!-- Please describe your changes on the following line: -->
Moved assertion that we are the lock owner to after the lock release. The problem is that Servo uses a reentrant lock for logging, so logging in the middle of mutating the lock is A Bad Idea.
While I was at it, I tidied up the reentrant lock code.
cc @jdm
---
<!-- 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 #13463.
- [X] These changes do not require tests because they fix an existing intermittent.
<!-- 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/13472)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/svggraphicselement.rs')
0 files changed, 0 insertions, 0 deletions