Skip to content

Some tweaks in libsimpleservo C API #22832

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.

Sign up for GitHub

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

Jump to bottom
Merged
bors-servo merged 2 commits into from
Feb 7, 2019
Merged

Some tweaks in libsimpleservo C API #22832

bors-servo merged 2 commits into from
Feb 7, 2019

Conversation

@paulrouget
Copy link
Contributor

@paulrouget paulrouget commented Feb 6, 2019 •
edited
Loading

  • Adding logs.
  • Adding OpenGL support for OSX.
  • Fixing file reading issue.

With this, I can load Servo into a C app (with the C version of libui + andlabs/libui#405).

This change is Reviewable

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Feb 6, 2019
@highfive
Copy link

highfive commented Feb 6, 2019

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!

@paulrouget paulrouget changed the title Some tweaks in the libsimpleservo C API Some tweaks in libsimpleservo C API Feb 6, 2019
@jdm
Copy link
Member

jdm commented Feb 6, 2019

@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Feb 6, 2019

📌 Commit a206a80 has been approved by jdm

@highfive highfive assigned jdm and unassigned asajeffrey Feb 6, 2019
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Feb 6, 2019
@bors-servo
Copy link
Contributor

bors-servo commented Feb 6, 2019

⌛ Testing commit a206a80 with merge df20520...

bors-servo pushed a commit that referenced this pull request Feb 6, 2019
Auto merge of #22832 - paulrouget:capi_tweaks, r=jdm
df20520 
Some tweaks in libsimpleservo C API

- Adding logs.
- Adding OpenGL support for OSX.
- Fixing file reading issue.

With this, I can load Servo into a C app (with the C version of libui + andlabs/libui#34).

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

bors-servo commented Feb 6, 2019

💔 Test failed - android-mac

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Feb 6, 2019
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Feb 6, 2019
@paulrouget
Copy link
Contributor Author

paulrouget commented Feb 6, 2019

I removed the commit that changes how file content is read. Hopefully we won't need this if this PR lands: #22836

@paulrouget
Copy link
Contributor Author

paulrouget commented Feb 6, 2019

@bors-servo r=jdm

@bors-servo
Copy link
Contributor

bors-servo commented Feb 6, 2019

📌 Commit 6060a36 has been approved by jdm

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Feb 6, 2019
@bors-servo
Copy link
Contributor

bors-servo commented Feb 6, 2019

⌛ Testing commit 6060a36 with merge 7e57f1b...

bors-servo pushed a commit that referenced this pull request Feb 6, 2019
Auto merge of #22832 - paulrouget:capi_tweaks, r=jdm
7e57f1b 
Some tweaks in libsimpleservo C API

- Adding logs.
- Adding OpenGL support for OSX.
- Fixing file reading issue.

With this, I can load Servo into a C app (with the C version of libui + andlabs/libui#405).

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

bors-servo commented Feb 6, 2019

💔 Test failed - status-taskcluster

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Feb 6, 2019
@jdm
Copy link
Member

jdm commented Feb 6, 2019 

error[E0412]: cannot find type `Rc` in this scope
  --> ports/libsimpleservo/api/src/gl_glue.rs:82:29
   |
82 |     pub fn init() -> Result<Rc<Gl>, &'static str> {
   |                             ^^ not found in this scope
help: possible candidate is found in another module, you can import it into scope
   |
82 |     use std::rc::Rc;
   |
error[E0412]: cannot find type `Gl` in this scope
  --> ports/libsimpleservo/api/src/gl_glue.rs:82:32
   |
82 |     pub fn init() -> Result<Rc<Gl>, &'static str> {
   |                                ^^ not found in this scope
help: possible candidate is found in another module, you can import it into scope
   |
82 |     use servo::gl::Gl;
   |
error: aborting due to 2 previous errors

@bors-servo
Copy link
Contributor

bors-servo commented Feb 6, 2019

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

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Feb 6, 2019
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Feb 7, 2019
@paulrouget
Copy link
Contributor Author

paulrouget commented Feb 7, 2019

@bors-servo r=jdm

@bors-servo
Copy link
Contributor

bors-servo commented Feb 7, 2019

📌 Commit 1292db6 has been approved by jdm

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. S-needs-rebase There are merge conflict errors. labels Feb 7, 2019
@bors-servo
Copy link
Contributor

bors-servo commented Feb 7, 2019

⌛ Testing commit 1292db6 with merge d029b1a...

bors-servo pushed a commit that referenced this pull request Feb 7, 2019
Auto merge of #22832 - paulrouget:capi_tweaks, r=jdm
d029b1a 
Some tweaks in libsimpleservo C API

- Adding logs.
- Adding OpenGL support for OSX.
- Fixing file reading issue.

With this, I can load Servo into a C app (with the C version of libui + andlabs/libui#405).

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

bors-servo commented Feb 7, 2019

☀️ Test successful - android-mac, arm32, arm64, linux-rel-css, linux-rel-wpt, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, magicleap, status-taskcluster
Approved by: jdm
Pushing d029b1a to master...

@bors-servo bors-servo merged commit 1292db6 into servo:master Feb 7, 2019
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Feb 7, 2019
@bors-servo bors-servo mentioned this pull request Feb 7, 2019
Closed
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@jdm jdm

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@paulrouget @highfive @jdm @bors-servo @asajeffrey