Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upfix double borrowing of image request #17120
Merged
Conversation
highfive
commented
Jun 1, 2017
highfive
commented
Jun 1, 2017
|
|
|
@bors-servo: r+ |
|
|
bors-servo
added a commit
that referenced
this pull request
Jun 1, 2017
…, r=jdm fix double borrowing of image request <!-- Please describe your changes on the following line: --> @jdm I couldn't reproduce the crashes, but looking at the code, I can tell that if we hit the cache inside `fetch_image`, we go straight to `process_image_response`, so we're still in the same scope as that where the borrowing occurs in `prepare_image_request`. When there is no cache hit, `process_image_response` is executed as part of a task... This should fix the issue, while retaining the original logic. All tests in `the-img-element` are passing... --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #17109 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- 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/17120) <!-- Reviewable:end -->
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
gterzian commentedJun 1, 2017
•
edited
@jdm I couldn't reproduce the crashes, but looking at the code, I can tell that if we hit the cache inside
fetch_image, we go straight toprocess_image_response, so we're still in the same scope as that where the borrowing occurs inprepare_image_request. When there is no cache hit,process_image_responseis executed as part of a task...This should fix the issue, while retaining the original logic.
All tests in
the-img-elementare passing..../mach build -ddoes not report any errors./mach test-tidydoes not report any errorsThis change is