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

Update webrender with crates.io's offscreen_gl_context (fixes #10296) #10297

Merged
merged 2 commits into from Mar 31, 2016
Merged

Update webrender with crates.io's offscreen_gl_context (fixes #10296) #10297

merged 2 commits into from Mar 31, 2016

Conversation

@nox
Copy link
Member

nox commented Mar 30, 2016

Crate webrender is bumped to the first commit in servo/webrender#248.
Crate webrender_traits is bumped to the merge of servo/webrender_traits#21.

This change is Reviewable
@nox
Reorder dependencies in components/canvas/Cargo.toml
a81793c
@highfive
Copy link

highfive commented Mar 30, 2016

Heads up! This PR modifies the following files:

  • @KiChjang: components/script/Cargo.toml, components/script_traits/Cargo.toml, components/script_traits/Cargo.toml
@highfive
Copy link

highfive commented Mar 30, 2016

warning Warning warning

  • These commits modify script code, but no tests are modified. Please consider adding a test!
@frewsxcv
Copy link
Member

frewsxcv commented Mar 30, 2016

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

bors-servo commented Mar 30, 2016

📌 Commit dff0121 has been approved by frewsxcv
@nox
Copy link
Member Author

nox commented Mar 30, 2016

@bors-servo r-

Wrong webrender revision.
@nox
Update webrender with crates.io's offscreen_gl_context (fixes #10296)
Loading status checks…
48b5d1d 
Crate webrender is bumped to the first commit in servo/webrender#248.
Crate webrender_traits is bumped to the merge of servo/webrender_traits#21.
@nox nox force-pushed the the-offscreens branch from dff0121 to 48b5d1d Mar 31, 2016
@nox nox changed the title Update webrender and move offscreen_gl_context to crates.io version Update webrender with crates.io's offscreen_gl_context (fixes #10296) Mar 31, 2016
@pcwalton
Copy link
Contributor

pcwalton commented Mar 31, 2016

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

bors-servo commented Mar 31, 2016

📌 Commit 48b5d1d has been approved by pcwalton
@nox nox mentioned this pull request Mar 31, 2016
Merged
@nox
Copy link
Member Author

nox commented Mar 31, 2016

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

bors-servo commented Mar 31, 2016

⌛ Testing commit 48b5d1d with merge 436f731...
bors-servo added a commit that referenced this pull request Mar 31, 2016
@bors-servo
Auto merge of #10297 - servo:the-offscreens, r=pcwalton
Loading status checks…
436f731 
Update webrender with crates.io's offscreen_gl_context (fixes #10296)

Crate webrender is bumped to the first commit in servo/webrender#248.
Crate webrender_traits is bumped to the merge of servo/webrender_traits#21.

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

bors-servo commented Mar 31, 2016

☀️ Test successful - android, arm32, gonk, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, status-appveyor
@bors-servo bors-servo merged commit 48b5d1d into master Mar 31, 2016
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@nox nox deleted the the-offscreens branch Mar 31, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@mbrubeck mbrubeck

Labels
S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@nox @highfive @frewsxcv @bors-servo @pcwalton @mbrubeck
You can’t perform that action at this time.