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

Some tweaks in libsimpleservo C API #22832

Merged
merged 2 commits into from Feb 7, 2019
Merged

Conversation

@paulrouget
Copy link
Contributor

paulrouget commented Feb 6, 2019

  • 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
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
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
@bors-servo
Copy link
Contributor

bors-servo commented Feb 6, 2019

Testing commit a206a80 with merge df20520...

bors-servo added a commit that referenced this pull request Feb 6, 2019
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

@paulrouget paulrouget force-pushed the paulrouget:capi_tweaks branch from a206a80 to bfcb8b4 Feb 6, 2019
@paulrouget paulrouget force-pushed the paulrouget:capi_tweaks branch from bfcb8b4 to 6060a36 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

@bors-servo
Copy link
Contributor

bors-servo commented Feb 6, 2019

Testing commit 6060a36 with merge 7e57f1b...

bors-servo added a commit that referenced this pull request Feb 6, 2019
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

@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.

@paulrouget paulrouget force-pushed the paulrouget:capi_tweaks branch from 6060a36 to 1292db6 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

@bors-servo
Copy link
Contributor

bors-servo commented Feb 7, 2019

Testing commit 1292db6 with merge d029b1a...

bors-servo added a commit that referenced this pull request Feb 7, 2019
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

@bors-servo bors-servo merged commit 1292db6 into servo:master Feb 7, 2019
4 checks passed
4 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
Travis CI - Pull Request Build Passed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Feb 7, 2019
5 of 5 tasks complete
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

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