Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Max session fix #15026

Merged
merged 1 commit into from Jan 15, 2017
Merged

Max session fix #15026

merged 1 commit into from Jan 15, 2017

Conversation

@tydus101
Copy link
Contributor

tydus101 commented Jan 14, 2017

Converted document discarding from an opt into a pref. Updated testing docs and changed all uses to pref api.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #14960 (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because current test suite is sufficient

This change is Reviewable

@highfive

This comment has been minimized.

Copy link

highfive commented Jan 14, 2017

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @jdm (or someone else) soon.

@highfive

This comment has been minimized.

Copy link

highfive commented Jan 14, 2017

Heads up! This PR modifies the following files:

  • @asajeffrey: components/constellation/constellation.rs
Copy link
Member

jdm left a comment

Let's squash all the commits into one, as well.

@@ -56,6 +56,7 @@
"layout.viewport.enabled": false,
"layout.writing-mode.enabled": false,
"network.mime.sniff": false,
"session_history.max_length":20,

This comment has been minimized.

Copy link
@jdm

jdm Jan 14, 2017

Member

Let's use session-history.max-length to be consistent with other preference names. Also, add a space after :.

This comment has been minimized.

Copy link
@tydus101

tydus101 Jan 14, 2017

Author Contributor

Oops, overlooked that. Thanks!

@tydus101 tydus101 force-pushed the tydus101:max-session-fix branch from f4e74b6 to c089221 Jan 14, 2017
@tydus101 tydus101 force-pushed the tydus101:max-session-fix branch from c089221 to 740e279 Jan 14, 2017
@@ -2136,7 +2136,8 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
} else if let Some(frame) = self.frames.get_mut(&frame_change.frame_id) {
debug!("Adding pipeline to existing frame.");
frame.load(frame_change.new_pipeline_id, frame_change.url.clone());
let evicted_id = frame.prev.len().checked_sub(opts::get().max_session_history)
let evicted_id = frame.prev.len()
.checked_sub(PREFS.get("session_history.max_length").as_u64().unwrap_or(20) as usize)

This comment has been minimized.

Copy link
@jdm

jdm Jan 14, 2017

Member

This needs to be renamed to match now.

@jdm

This comment has been minimized.

Copy link
Member

jdm commented Jan 14, 2017

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Jan 14, 2017

📌 Commit 740e279 has been approved by jdm

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Jan 14, 2017

⌛️ Testing commit 740e279 with merge 9e2fba3...

bors-servo added a commit that referenced this pull request Jan 14, 2017
Max session fix

<!-- Please describe your changes on the following line: -->
Converted document discarding from an opt into a pref. Updated testing docs and changed all uses to pref api.

---
<!-- 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 #14960 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because current test suite is sufficient

<!-- 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/15026)
<!-- Reviewable:end -->
@tydus101 tydus101 force-pushed the tydus101:max-session-fix branch from 740e279 to 92517c4 Jan 14, 2017
@@ -56,6 +56,7 @@
"layout.viewport.enabled": false,
"layout.writing-mode.enabled": false,
"network.mime.sniff": false,
"session-history.max-length":20,

This comment has been minimized.

Copy link
@cbrewster

cbrewster Jan 14, 2017

Member

nit: add a space between : and 20

…PREF api

updated test docs
@tydus101 tydus101 force-pushed the tydus101:max-session-fix branch from 92517c4 to 0fae39f Jan 14, 2017
@jdm

This comment has been minimized.

Copy link
Member

jdm commented Jan 14, 2017

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Jan 14, 2017

📌 Commit 0fae39f has been approved by jdm

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Jan 14, 2017

⌛️ Testing commit 0fae39f with merge d09bf70...

bors-servo added a commit that referenced this pull request Jan 14, 2017
Max session fix

<!-- Please describe your changes on the following line: -->
Converted document discarding from an opt into a pref. Updated testing docs and changed all uses to pref api.

---
<!-- 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 #14960 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because current test suite is sufficient

<!-- 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/15026)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

@bors-servo bors-servo merged commit 0fae39f into servo:master Jan 15, 2017
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.