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

Update WR (bitmap font fixes, serde deserialization optimizations). #19531

Merged
merged 1 commit into from Dec 10, 2017

Conversation

@glennw
Copy link
Member

glennw commented Dec 9, 2017

This change is Reviewable

@glennw
Copy link
Member Author

glennw commented Dec 9, 2017

r? @jdm

@gankro can answer any questions you have on the (temporary?) soft-fork of serde we are using to optimize DL deserialization time.

@highfive highfive assigned jdm and unassigned mbrubeck Dec 9, 2017
@jdm
Copy link
Member

jdm commented Dec 9, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Dec 9, 2017

📌 Commit dcd67e2 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Dec 9, 2017

Testing commit dcd67e2 with merge 554e903...

bors-servo added a commit that referenced this pull request Dec 9, 2017
Update WR (bitmap font fixes, serde deserialization optimizations).

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

bors-servo commented Dec 9, 2017

💔 Test failed - mac-dev-unit

@glennw
Copy link
Member Author

glennw commented Dec 9, 2017

@bors-servo retry

  • infra? build error somewhere in the media stack
@bors-servo
Copy link
Contributor

bors-servo commented Dec 9, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Dec 9, 2017

💔 Test failed - linux-rel-wpt

bors-servo added a commit to servo/webrender that referenced this pull request Dec 10, 2017
Allocate 2 GPU blocks for a deferred image

Fixes #2208 and supposedly servo/servo#19531 (comment)

The breakage is caused by this line: https://github.com/servo/webrender/pull/2162/files#diff-f5062b694b9fe53fc1757ed483d577d9R3923
The block count in the update used to be 1, which surprised me as a mistake. TL;DR: it was always wrong (! since `fetch_image_resource` requires exactly 2 blocks), but my fix was missing a crucial bit to work, which is this PR.

cc @glennw @staktrace

<!-- 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/2211)
<!-- Reviewable:end -->
@glennw glennw force-pushed the glennw:update-wr-bitmap-fonts branch from dcd67e2 to f97f80f Dec 10, 2017
@glennw
Copy link
Member Author

glennw commented Dec 10, 2017

Rebased and updated WR hash, which should hopefully fix the CI panics in the last run.

@bors-servo r=jdm

@bors-servo
Copy link
Contributor

bors-servo commented Dec 10, 2017

📌 Commit f97f80f has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Dec 10, 2017

Testing commit f97f80f with merge 92cbf56...

bors-servo added a commit that referenced this pull request Dec 10, 2017
Update WR (bitmap font fixes, serde deserialization optimizations).

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

bors-servo commented Dec 10, 2017

💔 Test failed - mac-dev-unit

@glennw
Copy link
Member Author

glennw commented Dec 10, 2017

@bors-servo retry

  • network error when building gecko-media?
@bors-servo
Copy link
Contributor

bors-servo commented Dec 10, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Dec 10, 2017

@bors-servo bors-servo merged commit f97f80f into servo:master Dec 10, 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
@glennw glennw deleted the glennw:update-wr-bitmap-fonts branch Dec 11, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.