Skip to content

/ servo

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

Bug 1366144: Correctly diff ::before and ::after pseudo-element styles if there's no generated content. r=heycam #16967

Merged
merged 8 commits into from May 20, 2017
Merged

Bug 1366144: Correctly diff ::before and ::after pseudo-element styles if there's no generated content. r=heycam #16967

merged 8 commits into from May 20, 2017

Conversation

@emilio
Copy link
Member

emilio commented May 20, 2017 •
edited by larsbergstrom

This change is Reviewable
@highfive
Copy link

highfive commented May 20, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/properties/gecko.mako.rs, components/style/properties/properties.mako.rs, components/style/matching.rs
@highfive
Copy link

highfive commented May 20, 2017

warning Warning warning

  • These commits modify style code, but no tests are modified. Please consider adding a test!
@emilio
Copy link
Member Author

emilio commented May 20, 2017

@bors-servo r=heycam p=10
@bors-servo
Copy link
Contributor

bors-servo commented May 20, 2017

📌 Commit b863fa7 has been approved by heycam
@highfive highfive assigned heycam and unassigned Manishearth May 20, 2017
@emilio
Copy link
Member Author

emilio commented May 20, 2017

I rebased #16906 on top of this one, since I want to make more patches to matching.rs. The test that was failing there is only by a subpixel offset and looks like an incremental layout bug. It's passing locally, so I'll try once more with it enabled, but if not I'll just mark it as failing.
@emilio
Copy link
Member Author

emilio commented May 20, 2017

@bors-servo r=heycam,emilio
@bors-servo
Copy link
Contributor

bors-servo commented May 20, 2017

📌 Commit d44bbb9 has been approved by heycam,emilio
@bors-servo
Copy link
Contributor

bors-servo commented May 20, 2017

☔ The latest upstream changes (presumably #16963) made this pull request unmergeable. Please resolve the merge conflicts.
emilio and others added 7 commits May 19, 2017
@emilio
Bug 1366144: Correctly diff ::before and ::after pseudo-element style…
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
605974a 
…s if there's no generated content. r=heycam

MozReview-Commit-ID: BHSxMJd0G0O
Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
@heycam @emilio
style: Add an outparam to Gecko_CalcStyleDifference that returns whet…
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
715d18d 
…her any style data changed.
@heycam @emilio
style: Use RestyleDamage to determine whether we must continue cascad…
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
8b7a414 
…ing style changes to children.
@heycam @emilio
style: List the matched rules with trace-level logging is enabled.
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
c13be5c
@heycam @emilio
style: Refactor RestyleHint to be a struct.
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
a397590 
Later PRs will add additional data to it that is not so easy to
represent using bitflags.
@heycam @emilio
style: Record in RestyleHints how far down the tree selector matching…
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
178939d 
… must be re-run.
@heycam @emilio
style: Generate RestyleHints to selector match at specific descendant…
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
Loading status checks…
b46e196 
… depths.
@emilio emilio force-pushed the emilio:after branch from d44bbb9 to b46e196 May 20, 2017
@emilio
Copy link
Member Author

emilio commented May 20, 2017

@bors-servo r=heycam,emilio
@bors-servo
Copy link
Contributor

bors-servo commented May 20, 2017

📌 Commit b46e196 has been approved by heycam,emilio
@emilio emilio mentioned this pull request May 20, 2017
Closed
2 of 5 tasks complete
@bors-servo
Copy link
Contributor

bors-servo commented May 20, 2017

⌛ Testing commit b46e196 with merge cbcc437...
bors-servo added a commit that referenced this pull request May 20, 2017
@bors-servo
Auto merge of #16967 - emilio:after, r=heycam,emilio
Loading status checks…
cbcc437 
Bug 1366144: Correctly diff ::before and ::after pseudo-element styles if there's no generated content. r=heycam

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

bors-servo commented May 20, 2017

💔 Test failed - linux-rel-css
@emilio
Mark tests/css/css21_dev/html4/border-collapse-dynamic-table-002.htm …
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
Loading status checks…
b30d48b 
…as failing.
@emilio emilio mentioned this pull request May 20, 2017
Open
@emilio
Copy link
Member Author

emilio commented May 20, 2017

@bors-servo r=heycam,emilio
@bors-servo
Copy link
Contributor

bors-servo commented May 20, 2017

📌 Commit b30d48b has been approved by heycam,emilio
@bors-servo
Copy link
Contributor

bors-servo commented May 20, 2017

⌛ Testing commit b30d48b with merge 05a26a2...
bors-servo added a commit that referenced this pull request May 20, 2017
@bors-servo
Auto merge of #16967 - emilio:after, r=heycam,emilio
Loading status checks…
05a26a2 
Bug 1366144: Correctly diff ::before and ::after pseudo-element styles if there's no generated content. r=heycam

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

bors-servo commented May 20, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-msvc-dev
Approved by: heycam,emilio
Pushing 05a26a2 to master...
@bors-servo bors-servo merged commit b30d48b into servo:master May 20, 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
This was referenced May 20, 2017
Merged
Closed
@emilio emilio deleted the emilio:after branch May 21, 2017
@wafflespeanut wafflespeanut mentioned this pull request May 21, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@heycam heycam

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@emilio @highfive @bors-servo @heycam @Manishearth
You can’t perform that action at this time.