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

stylo: Set the NS_STYLE_IS_TEXT_COMBINED flag. #17819

Merged
merged 1 commit into from Jul 22, 2017
Merged

stylo: Set the NS_STYLE_IS_TEXT_COMBINED flag. #17819

merged 1 commit into from Jul 22, 2017
+11 −0

Conversation

@emilio
Copy link
Member

emilio commented Jul 21, 2017 •
edited by larsbergstrom

This should fix at least
layout/reftests/writing-mode/1135361-ruby-justify-1.html

This change is Reviewable
@highfive
Copy link

highfive commented Jul 21, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/style_adjuster.rs, components/style/properties/computed_value_flags.rs
  • @canaltinova: components/style/style_adjuster.rs, components/style/properties/computed_value_flags.rs
@highfive
Copy link

highfive commented Jul 21, 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 Jul 21, 2017

r? @upsuper
@highfive highfive assigned upsuper and unassigned wafflespeanut Jul 21, 2017
@upsuper
Copy link
Member

upsuper commented Jul 21, 2017

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

bors-servo commented Jul 21, 2017

📌 Commit bfdaabf has been approved by upsuper
@emilio emilio force-pushed the emilio:text-combined branch from bfdaabf to 3be7c1f Jul 21, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2017

☔ The latest upstream changes (presumably #17822) made this pull request unmergeable. Please resolve the merge conflicts.
@emilio
stylo: Set the NS_STYLE_IS_TEXT_COMBINED flag.
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
Loading status checks…
b576229 
This should fix at least
layout/reftests/writing-mode/1135361-ruby-justify-1.html
@emilio emilio force-pushed the emilio:text-combined branch from 3be7c1f to b576229 Jul 22, 2017
@emilio
Copy link
Member Author

emilio commented Jul 22, 2017

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

bors-servo commented Jul 22, 2017

📌 Commit b576229 has been approved by xidorn
@bors-servo
Copy link
Contributor

bors-servo commented Jul 22, 2017

⌛ Testing commit b576229 with merge e4ac067...
bors-servo added a commit that referenced this pull request Jul 22, 2017
@bors-servo
Auto merge of #17819 - emilio:text-combined, r=xidorn
Loading status checks…
e4ac067 
stylo: Set the NS_STYLE_IS_TEXT_COMBINED flag.

This should fix at least
layout/reftests/writing-mode/1135361-ruby-justify-1.html

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

bors-servo commented Jul 22, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: xidorn
Pushing e4ac067 to master...
@bors-servo bors-servo merged commit b576229 into servo:master Jul 22, 2017
1 of 2 checks passed
1 of 2 checks passed
continuous-integration/appveyor/pr AppVeyor was unable to build non-mergeable pull request
Details
homu Test successful
Details
@emilio emilio deleted the emilio:text-combined branch Jul 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@upsuper upsuper

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 @upsuper @bors-servo @wafflespeanut
You can’t perform that action at this time.