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

Fixes for compute_damage #10109

Merged
merged 2 commits into from Mar 22, 2016
Merged

Conversation

@mbrubeck
Copy link
Contributor

mbrubeck commented Mar 21, 2016

A few changes:

  • Make compute_damage short-circuit more, by skipping comparisons if they will only set flags that are already set.
  • Update some obsolete comments.
  • Add a bunch of missing properties to compute_damage.
  • Set RECONSTRUCT_FLOW when text-decoration changes, because it can affect text fragment splitting/merging.

I believe this is all of the computed properties except for the animation properties. (I wasn't sure what to do with those.) After this lands I'd like to work on moving this information into properties.mako.rs so that this function can be auto-generated, and so that newly-added properties can default to setting all flags instead of none.


This change is Reviewable

@mbrubeck
Copy link
Contributor Author

mbrubeck commented Mar 21, 2016

@highfive highfive assigned pcwalton and unassigned emilio Mar 21, 2016
@pcwalton
Copy link
Contributor

pcwalton commented Mar 21, 2016

@bors-servo: r+

Looks good!

@bors-servo
Copy link
Contributor

bors-servo commented Mar 21, 2016

📌 Commit b899ec2 has been approved by pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Mar 21, 2016

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

@mbrubeck mbrubeck force-pushed the mbrubeck:compute_damage_short_circuit branch from b899ec2 to f7d490a Mar 21, 2016
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Mar 21, 2016

@bors-servo r=pcwalton

rebased

@bors-servo
Copy link
Contributor

bors-servo commented Mar 21, 2016

📌 Commit f7d490a has been approved by pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Mar 22, 2016

Testing commit f7d490a with merge d1e27eb...

bors-servo added a commit that referenced this pull request Mar 22, 2016
Fixes for compute_damage

A few changes:

* Make `compute_damage` short-circuit more, by skipping comparisons if they will only set flags that are already set.

* Update some obsolete comments.

* Add a bunch of missing properties to `compute_damage`.

* Set `RECONSTRUCT_FLOW` when `text-decoration` changes, because it can affect text fragment splitting/merging.

I believe this is all of the computed properties except for the animation properties. (I wasn't sure what to do with those.)  After this lands I'd like to work on moving this information into `properties.mako.rs` so that this function can be auto-generated, and so that newly-added properties can default to setting all flags instead of none.

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

bors-servo commented Mar 22, 2016

@bors-servo bors-servo merged commit f7d490a into servo:master Mar 22, 2016
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
@mbrubeck mbrubeck deleted the mbrubeck:compute_damage_short_circuit branch May 11, 2016
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

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