This repository has been archived by the owner on Jun 8, 2020. It is now read-only.
Merge our separate Skia crates. #86
Open
DiamondLovesYou
wants to merge
14
commits into
servo:master
Choose a base branch
from
DiamondLovesYou:master
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Can you explain a little more about the goals here? |
It was suggested by @SimonSapin in a few emails we exchanged that at some point we merge our separate crates into one so our work isn't unnessarily duplicated. This PR reflects this suggestion. |
☔ The latest upstream changes (presumably #87) made this pull request unmergeable. Please resolve the merge conflicts. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I've moved the old wrapping code to this crate, so Servo will need to depend on that instead of
skia-sys
. I kept the module scopes as is, so it should work as a drop-in replacement for Servo.