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

Ensure that we update the epoch of images so that we don't redraw them. #2240

Merged
merged 4 commits into from Dec 21, 2017

Conversation

@jrmuizel
Copy link
Contributor

jrmuizel commented Dec 19, 2017

This cleans up the rawtests a little, adds the ability to track blob image requests, adds a test to make sure that we don't request unnecessarily and fixes the test.


This change is Reviewable

@jrmuizel jrmuizel force-pushed the jrmuizel:update-template branch from fa03b89 to 99c3265 Dec 19, 2017
@jrmuizel
Copy link
Contributor Author

jrmuizel commented Dec 19, 2017

@mstange this fixes a constant redrawing bug that I ran into with the current blob image invalidation code.

@kvark
kvark approved these changes Dec 19, 2017
Copy link
Member

kvark left a comment

Great to have a fix as well as a new test!
I wish we could have something nicer than an extra callback struct with two boxed functions though... Like, maybe, just accumulate all requests into a vector that the wrench user (as in - a raw test) can drain at any time and check.

);

let mut builder = DisplayListBuilder::new(self.wrench.root_pipeline_id, layout_size);
builder.push_image(

This comment has been minimized.

@kvark

kvark Dec 19, 2017

Member

a lot of duplicated code with push_image, let's have a helper?

self.wrench
.api
.generate_frame(self.wrench.document_id, None);
self.submit_dl(&mut Epoch(0), layout_size, builder, None);

This comment has been minimized.

@kvark

kvark Dec 19, 2017

Member

nice savings 👍

@jrmuizel jrmuizel force-pushed the jrmuizel:update-template branch 2 times, most recently from 5c3ed1c to 5ae2273 Dec 20, 2017
@glennw
Copy link
Member

glennw commented Dec 20, 2017

@kvark @jrmuizel Is this ready to merge now?

@kvark
kvark approved these changes Dec 20, 2017
@kvark
Copy link
Member

kvark commented Dec 20, 2017

yes!
@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Dec 20, 2017

📌 Commit 5ae2273 has been approved by kvark

@bors-servo
Copy link
Contributor

bors-servo commented Dec 20, 2017

Testing commit 5ae2273 with merge eccaaa8...

bors-servo added a commit that referenced this pull request Dec 20, 2017
Ensure that we update the epoch of images so that we don't redraw them.

This cleans up the rawtests a little, adds the ability to track blob image requests, adds a test to make sure that we don't request unnecessarily and fixes the test.

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

bors-servo commented Dec 20, 2017

💔 Test failed - status-travis

@bors-servo
Copy link
Contributor

bors-servo commented Dec 21, 2017

The latest upstream changes (presumably #2244) made this pull request unmergeable. Please resolve the merge conflicts.

@glennw
Copy link
Member

glennw commented Dec 21, 2017

Needs a (small) rebase.

jrmuizel added 4 commits Dec 19, 2017
This factors out a 'submit_dl' method that lets us reduce the size of the tests.
This lets us check that we call render an appropriate number of times.
Previously once we had sent an update for an image we'd keep redrawing
it every frame.
@jrmuizel jrmuizel force-pushed the jrmuizel:update-template branch from 5ae2273 to d8f1211 Dec 21, 2017
@kvark
Copy link
Member

kvark commented Dec 21, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Dec 21, 2017

📌 Commit d8f1211 has been approved by kvark

@bors-servo
Copy link
Contributor

bors-servo commented Dec 21, 2017

Testing commit d8f1211 with merge 22a3390...

bors-servo added a commit that referenced this pull request Dec 21, 2017
Ensure that we update the epoch of images so that we don't redraw them.

This cleans up the rawtests a little, adds the ability to track blob image requests, adds a test to make sure that we don't request unnecessarily and fixes the test.

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

bors-servo commented Dec 21, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: kvark
Pushing 22a3390 to master...

@bors-servo bors-servo merged commit d8f1211 into servo:master Dec 21, 2017
3 of 4 checks passed
3 of 4 checks passed
code-review/reviewable 4 files, 2 discussions left (kvark)
Details
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
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
Linked issues

Successfully merging this pull request may close these issues.

None yet

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