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

stylo: Set the NS_STYLE_IS_TEXT_COMBINED flag. #17819

Merged
merged 1 commit into from Jul 22, 2017

Conversation

@emilio
Copy link
Member

commented Jul 21, 2017

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


This change is Reviewable

@highfive

This comment has been minimized.

Copy link

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

This comment has been minimized.

Copy link

commented Jul 21, 2017

warning Warning warning

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

This comment has been minimized.

Copy link
Member Author

commented Jul 21, 2017

@highfive highfive assigned upsuper and unassigned wafflespeanut Jul 21, 2017

@upsuper

This comment has been minimized.

Copy link
Member

commented Jul 21, 2017

@bors-servo

This comment has been minimized.

Copy link
Contributor

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

This comment has been minimized.

Copy link
Contributor

commented Jul 21, 2017

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

stylo: Set the NS_STYLE_IS_TEXT_COMBINED flag.
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

This comment has been minimized.

Copy link
Member Author

commented Jul 22, 2017

@bors-servo r=xidorn p=10

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Jul 22, 2017

📌 Commit b576229 has been approved by xidorn

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Jul 22, 2017

⌛️ Testing commit b576229 with merge e4ac067...

bors-servo added a commit that referenced this pull request Jul 22, 2017
Auto merge of #17819 - emilio:text-combined, r=xidorn
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

This comment has been minimized.

Copy link
Contributor

commented Jul 22, 2017

@bors-servo bors-servo merged commit b576229 into servo:master Jul 22, 2017

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
Projects
None yet
5 participants
You can’t perform that action at this time.