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

Switch AlphaBatchKeyFlags to use bitflags! crate. #541

Merged
merged 1 commit into from Nov 9, 2016

Conversation

@moriturus
Copy link
Contributor

moriturus commented Nov 8, 2016

Sorry about my mistake on #539 then I re-open this PR.

This change is Reviewable

Copy link
Member

glennw left a comment

Nearly there, just one more fix needed! :)

} else {
AlphaBatchKeyFlags::empty()
};
let flags = AXIS_ALIGNED | needs_clipping_flag;

This comment has been minimized.

@glennw

glennw Nov 8, 2016

Member

Sorry, my last comment was not very well described. We still need to check if transform_kind == AxisAligned, and only set the AXIS_ALIGNED flag if that's true. When that's done, the fn transform_kind() function will work correctly, as it will return AxisAligned if the AXIS_ALIGNED bit was set, and Complex otherwise.

@glennw
Copy link
Member

glennw commented Nov 8, 2016

@moriturus Looks good, thanks! Would you mind squashing these into one commit and then I'll get it merged.

@glennw
Copy link
Member

glennw commented Nov 9, 2016

@glennw
glennw approved these changes Nov 9, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2016

📌 Commit 9ba6d2f has been approved by glennw

@glennw
Copy link
Member

glennw commented Nov 9, 2016

Thanks!

@bors-servo
Copy link
Contributor

bors-servo commented Nov 9, 2016

Testing commit 9ba6d2f with merge 0ec2eb7...

bors-servo added a commit that referenced this pull request Nov 9, 2016
Switch AlphaBatchKeyFlags to use bitflags! crate.

Sorry about my mistake on #539 then I re-open this PR.

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

bors-servo commented Nov 9, 2016

☀️ Test successful - status-travis

@bors-servo bors-servo merged commit 9ba6d2f into servo:master Nov 9, 2016
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
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

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