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

Move windowing code out of the compositor #3533

Closed
wants to merge 11 commits into from
Closed

Move windowing code out of the compositor #3533

wants to merge 11 commits into from

Conversation

@mbrubeck
Copy link
Contributor

mbrubeck commented Sep 30, 2014

This is mainly just moving code around, in preparation for further changes to
the "windowing" API.

r? @larsbergstrom
@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Sep 30, 2014

Critic review: https://critic.hoppipolla.co.uk/r/2735

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.
@highfive
Copy link

highfive commented Sep 30, 2014

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
bors-servo pushed a commit that referenced this pull request Sep 30, 2014
bors-servo
auto merge of #3533 : mbrubeck/servo/app, r=larsbergstrom
Loading status checks…
cae88aa 
This is mainly just moving code around, in preparation for further changes to
the "windowing" API.

r? @larsbergstrom
bors-servo pushed a commit that referenced this pull request Sep 30, 2014
bors-servo
auto merge of #3533 : mbrubeck/servo/app, r=larsbergstrom
Loading status checks…
d6aaae9 
This is mainly just moving code around, in preparation for further changes to
the "windowing" API.

r? @larsbergstrom
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Sep 30, 2014

Everything is passing on Linux, but reftests are crashing on Mac, and CEF fails to link on Mac.
bors-servo pushed a commit that referenced this pull request Sep 30, 2014
bors-servo
auto merge of #3533 : mbrubeck/servo/app, r=mbrubeck
Loading status checks…
09e73b3 
This is mainly just moving code around, in preparation for further changes to
the "windowing" API.

r? @larsbergstrom
bors-servo pushed a commit that referenced this pull request Sep 30, 2014
bors-servo
auto merge of #3533 : mbrubeck/servo/app, r=mbrubeck
Loading status checks…
a124971 
This is mainly just moving code around, in preparation for further changes to
the "windowing" API.

r? @larsbergstrom
mbrubeck added 9 commits Sep 29, 2014
@mbrubeck
Move windowing code out of the compositor
f61c802 
This is mainly just moving code around, in preparation for further changes to
the "windowing" API.
@mbrubeck
Update CEF port to use glfwapp
4fc9433
@mbrubeck
Update to latest servo/glfw-rs
9bed9ea 
Picks up servo/glfw-rs#26.
@mbrubeck
Update Cargo.lock to match actual glfw-rs rev
486f3d6
@mbrubeck
Fix headless mode
cc386a7
@mbrubeck
Revert some CEF changes (try to fix Mac build errors)
64730b7
@mbrubeck
Change glfw-app to glfw_app (try to fix Mac linker error)
ce7ceca
@mbrubeck
Make crate name match package name (try to fix Mac build)
27160e7
@mbrubeck
Explicitly link glfw_app into libservo
Loading status checks…
aad63b9
@mbrubeck mbrubeck force-pushed the mbrubeck:app branch from f92e607 to aad63b9 Oct 1, 2014
@mbrubeck

This comment has been minimized.

Sign in to view
Copy link
Owner Author

mbrubeck commented on aad63b9 Oct 1, 2014

r+

This comment has been minimized.

Sign in to view
Copy link
Owner Author

mbrubeck replied Oct 1, 2014

Note: I'm currently testing some theories about why the reftests are failing on Mac buildbot. I still haven't solved the CEF link errors on Mac, so this won't actually land. :(
@bors-servo

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo commented on aad63b9 Oct 1, 2014

saw approval from mbrubeck
at mbrubeck@aad63b9

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Oct 1, 2014

merging mbrubeck/servo/app = aad63b9 into auto

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Oct 1, 2014

mbrubeck/servo/app = aad63b9 merged ok, testing candidate = ebd1e3a

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Oct 1, 2014

some tests failed:
failure: http://build.servo.org/builders/mac/builds/120
bors-servo pushed a commit that referenced this pull request Oct 1, 2014
bors-servo
auto merge of #3533 : mbrubeck/servo/app, r=mbrubeck
Loading status checks…
ebd1e3a 
This is mainly just moving code around, in preparation for further changes to
the "windowing" API.

r? @larsbergstrom
@mbrubeck
Init GLFW with LOG_ERRORS
Loading status checks…
485d495
@mbrubeck

This comment has been minimized.

Sign in to view
Copy link
Owner Author

mbrubeck commented on 485d495 Oct 1, 2014

r+
@bors-servo

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo commented on 485d495 Oct 1, 2014

saw approval from mbrubeck
at mbrubeck@485d495

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Oct 1, 2014

merging mbrubeck/servo/app = 485d495 into auto

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Oct 1, 2014

mbrubeck/servo/app = 485d495 merged ok, testing candidate = bf495e9

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Oct 1, 2014

some tests failed:
failure: http://build.servo.org/builders/mac/builds/122
bors-servo pushed a commit that referenced this pull request Oct 1, 2014
bors-servo
auto merge of #3533 : mbrubeck/servo/app, r=mbrubeck
Loading status checks…
bf495e9 
This is mainly just moving code around, in preparation for further changes to
the "windowing" API.

r? @larsbergstrom
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Oct 1, 2014

Using glfw::LOG_ERRORS fixed the Mac reftest failures. There's still a link error in ports/cef on Mac for reasons unknown.
@larsbergstrom larsbergstrom mentioned this pull request Oct 2, 2014
Closed
0 of 1 task complete
@mbrubeck
Move glut_app into ports/android
fa6d493
@mbrubeck mbrubeck mentioned this pull request Oct 2, 2014
Merged
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Oct 2, 2014

Moving this to #3563.
@mbrubeck mbrubeck closed this Oct 2, 2014
@mbrubeck mbrubeck mentioned this pull request Oct 6, 2014
Closed
bors-servo pushed a commit that referenced this pull request Oct 9, 2014
bors-servo
auto merge of #3563 : mbrubeck/servo/app2, r=larsbergstrom
Loading status checks…
74fc874 
This includes the previously-reviewed commits from #3533, plus additional fixes for test failures, and a workaround for CEF link errors on Mac (related to rust-lang/rust#14344).  Opening a new PR because this required a fairly invasive rebase, and the original was polluted by a bunch of test commits. r? @larsbergstrom
bors-servo pushed a commit that referenced this pull request Oct 10, 2014
bors-servo
auto merge of #3563 : mbrubeck/servo/app2, r=larsbergstrom
Loading status checks…
528ad45 
This includes the previously-reviewed commits from #3533, plus additional fixes for test failures, and a workaround for CEF link errors on Mac (related to rust-lang/rust#14344).  Opening a new PR because this required a fairly invasive rebase, and the original was polluted by a bunch of test commits. r? @larsbergstrom
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
@mbrubeck @hoppipolla-critic-bot @highfive @bors-servo
You can’t perform that action at this time.