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

Use DisplayListSection everywhere #9059

Merged
merged 1 commit into from Jan 9, 2016

Conversation

@mrobinson
Copy link
Member

mrobinson commented Dec 23, 2015

DisplayListSection, StackingLevel, and BackgroundAndBorderLevel all
represent pretty much the same thing, a particular section of the
display list. Instead of maintaining three enums which do the same
thing, just use DisplayListSection everywhere. It's a superset of the
other two and this change will make it easier to flatten the DisplayList
in the future for WebRender.

Review on Reviewable

@highfive
Copy link

highfive commented Dec 23, 2015

warning Warning warning

  • These commits modify layout code, but no reftests are modified. Please consider adding a reftest!
@nox
Copy link
Member

nox commented Dec 30, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Jan 8, 2016

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

DisplayListSection, StackingLevel, and BackgroundAndBorderLevel all
represent pretty much the same thing, a particular section of the
display list. Instead of maintaining three enums which do the same
thing, just use DisplayListSection everywhere. It's a superset of the
other two and this change will make it easier to flatten the DisplayList
in the future for WebRender.
@mrobinson mrobinson force-pushed the mrobinson:simplify-display-list-sections branch from f920884 to d720452 Jan 8, 2016
@pcwalton
Copy link
Contributor

pcwalton commented Jan 8, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Jan 8, 2016

📌 Commit d720452 has been approved by pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Jan 8, 2016

Testing commit d720452 with merge b13c988...

bors-servo added a commit that referenced this pull request Jan 8, 2016
…alton

Use DisplayListSection everywhere

DisplayListSection, StackingLevel, and BackgroundAndBorderLevel all
represent pretty much the same thing, a particular section of the
display list. Instead of maintaining three enums which do the same
thing, just use DisplayListSection everywhere. It's a superset of the
other two and this change will make it easier to flatten the DisplayList
in the future for WebRender.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9059)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jan 8, 2016

💔 Test failed - linux-rel

@nox
Copy link
Member

nox commented Jan 8, 2016

@nox nox added S-awaiting-merge and removed S-tests-failed labels Jan 8, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Jan 9, 2016

Testing commit d720452 with merge be555a9...

bors-servo added a commit that referenced this pull request Jan 9, 2016
…alton

Use DisplayListSection everywhere

DisplayListSection, StackingLevel, and BackgroundAndBorderLevel all
represent pretty much the same thing, a particular section of the
display list. Instead of maintaining three enums which do the same
thing, just use DisplayListSection everywhere. It's a superset of the
other two and this change will make it easier to flatten the DisplayList
in the future for WebRender.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9059)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jan 9, 2016

@bors-servo bors-servo merged commit d720452 into servo:master Jan 9, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@mrobinson mrobinson deleted the mrobinson:simplify-display-list-sections branch Nov 16, 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.