aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/timers.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-01-04 13:58:57 -0800
committerGitHub <noreply@github.com>2017-01-04 13:58:57 -0800
commit16b0da5004fd730de87883daa35a78b6af01f042 (patch)
tree3390d897e9d9cb6826f603cbac89006e82ddbc43 /components/script/timers.rs
parent2fe914e2fa68f44db903bc3de55d9823a44cdf0d (diff)
parentc14c431d0a9ec448f5dc7e65afc4457ede519cce (diff)
downloadservo-16b0da5004fd730de87883daa35a78b6af01f042.tar.gz
servo-16b0da5004fd730de87883daa35a78b6af01f042.zip
Auto merge of #14312 - asajeffrey:script-discard-documents, r=cbrewster
Implement discarding Document objects to reclaim space. <!-- Please describe your changes on the following line: --> This PR implements document discarding. Active documents are kept alive strongly, but inactive documents are only kept alive weakly. When a document is GCd, it is marked as discarded, and if it is every reactivated, a reload of the URL is triggered. Note that this PR is pretty aggressive about discarding, and can any inactive document (other than those being kept alive by other same-origin pipelines). We might want to damp it down a bit. Also note that this interacts with browser.html in that the reloading triggered by reactivating a document triggers mozbrowser events. To test this, I added a `-Zdiscard-inactive-documents` debug flag, which discards all inactive documents, even ones which are reachable through other same-origin pipelines. --- <!-- 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 #14262. - [X] These changes do not require tests because we should be able to use the existing tests with `-Zdiscard-inactive-documents`. <!-- 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/14312) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/timers.rs')
-rw-r--r--components/script/timers.rs10
1 files changed, 6 insertions, 4 deletions
diff --git a/components/script/timers.rs b/components/script/timers.rs
index 14c4eb89c13..b86bdc17aae 100644
--- a/components/script/timers.rs
+++ b/components/script/timers.rs
@@ -228,18 +228,20 @@ impl OneshotTimers {
}
pub fn suspend(&self) {
- assert!(self.suspended_since.get().is_none());
+ // Suspend is idempotent: do nothing if the timers are already suspended.
+ if self.suspended_since.get().is_some() {
+ return warn!("Suspending an already suspended timer.");
+ }
self.suspended_since.set(Some(precise_time_ms()));
self.invalidate_expected_event_id();
}
pub fn resume(&self) {
- assert!(self.suspended_since.get().is_some());
-
+ // Suspend is idempotent: do nothing if the timers are already suspended.
let additional_offset = match self.suspended_since.get() {
Some(suspended_since) => precise_time_ms() - suspended_since,
- None => panic!("Timers are not suspended.")
+ None => return warn!("Resuming an already resumed timer."),
};
self.suspension_offset.set(self.suspension_offset.get() + additional_offset);