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

Jump to bottom

Frames in the constellation store LoadData rather than just URLs. #15878

Merged
merged 1 commit into from Mar 14, 2017
Merged

Frames in the constellation store LoadData rather than just URLs. #15878

merged 1 commit into from Mar 14, 2017

Conversation

asajeffrey
Copy link
Member

@asajeffrey asajeffrey commented Mar 9, 2017 •
edited by larsbergstrom

Include LoadData in each session history entry, so that when we reload discarded documents we can include POST data etc.

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix Save additional load data in Frame #14888
  • These changes do not require tests because we don't test document discarding.

This change is Reviewable

@asajeffrey asajeffrey added the A-constellation Involves the constellation label Mar 9, 2017
@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Mar 9, 2017
@asajeffrey
Copy link
Member Author

r? @cbrewster

@highfive highfive assigned cbrewster and unassigned Manishearth Mar 9, 2017
cbrewster
cbrewster approved these changes Mar 12, 2017
View reviewed changes
Copy link
Contributor

@cbrewster cbrewster left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good other than a couple nits

components/constellation/frame.rs Outdated
@@ -81,7 +80,7 @@ impl Frame {
pub fn update_current(&mut self, pipeline_id: PipelineId, entry: &FrameState) {
self.pipeline_id = pipeline_id;
self.instant = entry.instant;
self.url = entry.url.clone();
self.load_data = entry.load_data.clone();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should make update_current take ownership of entry to remove this clone.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

components/constellation/constellation.rs
self.traverse_to_entry(entry);
(evicted_id, false, None, false)
(None, false, None, false)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that only one branch returns something other than None for evicted_id can we just move close_pipeline inside the only branch that uses it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Afraid not:

error[E0499]: cannot borrow `*self` as mutable more than once at a time
    --> /home/ajeffrey/github/asajeffrey/servo/components/constellation/constellation.rs:2165:17
     |
2156 |         } else if let Some(frame) = self.frames.get_mut(&frame_change.frame_id) {
     |                                     ----------- first mutable borrow occurs here
...
2165 |                 self.close_pipeline(evicted_id, DiscardBrowsingContext::No, ExitPipelineMode::Normal);
     |                 ^^^^ second mutable borrow occurs here
...
2171 |         };
     |         - first borrow ends here

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:(

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed. Is it still r=you?

Copy link
Contributor

@KiChjang KiChjang Mar 14, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes me want to have 2-phase borrowing here...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed.

@asajeffrey asajeffrey force-pushed the constellation-frames-store-loaddata branch from 7cbd54c to 90650da Compare March 14, 2017 15:12
cbrewster
cbrewster reviewed Mar 14, 2017
View reviewed changes
components/constellation/frame.rs Outdated

/// Is the new document replacing the current document (e.g. a reload)
/// or pushing it into the session history (e.g. a navigation)?
pub replace: Option<FrameState>,
/// It it replacing an existing entry, we store its timestamp.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/It it/If it is/

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

@asajeffrey asajeffrey force-pushed the constellation-frames-store-loaddata branch from 90650da to 1a44a76 Compare March 14, 2017 19:28
@asajeffrey
Copy link
Member Author

@bors-servo r=cbrewster

@bors-servo
Copy link
Contributor

📌 Commit 1a44a76 has been approved by cbrewster

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Mar 14, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit 1a44a76 with merge 569d51d...

bors-servo pushed a commit that referenced this pull request Mar 14, 2017
Auto merge of #15878 - asajeffrey:constellation-frames-store-loaddata…
569d51d 
…, r=cbrewster

Frames in the constellation store LoadData rather than just URLs.

<!-- Please describe your changes on the following line: -->

Include LoadData in each session history entry, so that when we reload discarded documents we can include POST data etc.

---
<!-- 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 #14888
- [X] These changes do not require tests because we don't test document discarding.

<!-- 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/15878)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-gnu-dev, windows-msvc-dev
Approved by: cbrewster
Pushing 569d51d to master...

@bors-servo bors-servo merged commit 1a44a76 into servo:master Mar 14, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Mar 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KiChjang KiChjang KiChjang left review comments

@cbrewster cbrewster cbrewster approved these changes

Assignees

@cbrewster cbrewster

Labels
A-constellation Involves the constellation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Save additional load data in Frame
6 participants
@asajeffrey @bors-servo @KiChjang @cbrewster @Manishearth @highfive