Skip to content

/ webrender

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

Expose images to the BlobImageRenderer. #1018

Merged
merged 1 commit into from Apr 26, 2017
Merged

Expose images to the BlobImageRenderer. #1018

merged 1 commit into from Apr 26, 2017
+56 −15

Conversation

@nical
Copy link
Collaborator

nical commented Mar 28, 2017 •
edited by larsbergstrom

See issue #1017. The idea would be to do the same for fonts and paths.

r? @glennw

This change is Reviewable
@glennw
Copy link
Member

glennw commented Mar 28, 2017

This seems like a minimal change that doesn't affect other areas anyway. Just need to fix the compile errors on CI, then r=me.
@glennw glennw self-requested a review Mar 28, 2017
@glennw
glennw approved these changes Mar 28, 2017
View changes
Copy link
Member

glennw left a comment

r=me once the CI compile error is fixed.
@bors-servo
Copy link
Contributor

bors-servo commented Mar 29, 2017

☔ The latest upstream changes (presumably #1004) made this pull request unmergeable. Please resolve the merge conflicts.
@nical nical force-pushed the nical:blob-ref-image branch 2 times, most recently from 8739743 to d2afb9b Mar 29, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Mar 30, 2017

☔ The latest upstream changes (presumably #997) made this pull request unmergeable. Please resolve the merge conflicts.
@glennw
Copy link
Member

glennw commented Mar 30, 2017

@nical Needs another rebase.
@nical nical force-pushed the nical:blob-ref-image branch from d2afb9b to de4bd6b Apr 21, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Apr 24, 2017

☔ The latest upstream changes (presumably #1160) made this pull request unmergeable. Please resolve the merge conflicts.
@nical
Copy link
Collaborator Author

nical commented Apr 26, 2017

Can we land this? I have work in progress that I need to rebase on top of it.
@kvark
Copy link
Member

kvark commented Apr 26, 2017

@nical sure thing, but it's not mergable atm.
@nical
Expose images to the BlobImageRenderer.
Loading status checks…
a29dabc
@nical nical force-pushed the nical:blob-ref-image branch from de4bd6b to a29dabc Apr 26, 2017
@nical
Copy link
Collaborator Author

nical commented Apr 26, 2017

Woops I missed that. Rebased.
@kvark
kvark reviewed Apr 26, 2017
View changes
webrender/src/resource_cache.rs
@@ -116,6 +116,40 @@ struct ImageResource {
dirty_rect: Option<DeviceUintRect>
}

struct ImageTemplates {

This comment has been minimized.

Sign in to view
@kvark

kvark Apr 26, 2017

Member

any reason for this to be a separate struct?

This comment has been minimized.

Sign in to view
@nical

nical Apr 26, 2017

Author Collaborator

The reason is the borrow checker. Without the separate struct the resource cache ends up being "entirely" borrowed when passed to the blob renderer which can't happen because we are already borrowing it partially (the blob renderer itself).

This comment has been minimized.

Sign in to view
@kvark

kvark Apr 26, 2017

Member

I don't understand. How does this change from the borrowck point of view if you just do type ImageTemplates = HashMap<...>?

This comment has been minimized.

Sign in to view
@kvark

kvark Apr 26, 2017

Member

as per IRC discussion, having a separate type allows us to implement ImageStore, which is needed to abstract away from BlobImageRenderer
@kvark
Copy link
Member

kvark commented Apr 26, 2017

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Apr 26, 2017

📌 Commit a29dabc has been approved by kvark
@bors-servo
Copy link
Contributor

bors-servo commented Apr 26, 2017

⌛ Testing commit a29dabc with merge fc9ee5b...
bors-servo added a commit that referenced this pull request Apr 26, 2017
@bors-servo
Auto merge of #1018 - nical:blob-ref-image, r=kvark
Loading status checks…
fc9ee5b 
Expose images to the BlobImageRenderer.

See issue #1017. The idea would be to do the same for fonts and paths.

r? @glennw

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/1018)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 26, 2017

☀️ Test successful - status-travis
Approved by: kvark
Pushing fc9ee5b to master...
@bors-servo bors-servo merged commit a29dabc into servo:master Apr 26, 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
@bors-servo bors-servo mentioned this pull request Apr 26, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kvark kvark

@glennw glennw

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
@nical @glennw @bors-servo @kvark
You can’t perform that action at this time.