Skip to content

Commit

Permalink
Auto merge of #22871 - jdm:simpleml, r=paul,asajeffrey
Browse files Browse the repository at this point in the history
Use simpleservo embedding API for Magic Leap

This removes the duplication between the two ports and makes it easier to improve all of our embeddings simultaneously.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #22065
- [x] These changes do not require tests because no automated tests for embedded devices.

<!-- 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/22871)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Mar 1, 2019
2 parents 27f443f + 176e722 commit 40e9b84
Show file tree
Hide file tree
Showing 11 changed files with 256 additions and 375 deletions.
3 changes: 2 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions components/servo/Cargo.toml
Expand Up @@ -51,6 +51,7 @@ euclid = "0.19"
gfx = {path = "../gfx"}
gleam = "0.6"
ipc-channel = "0.11"
keyboard-types = "0.4"
layout_thread = {path = "../layout_thread"}
log = "0.4"
msg = {path = "../msg"}
Expand Down
1 change: 1 addition & 0 deletions components/servo/lib.rs
Expand Up @@ -112,6 +112,7 @@ use webrender::{RendererKind, ShaderPrecacheFlags};
use webvr::{VRServiceManager, WebVRCompositorHandler, WebVRThread};

pub use gleam::gl;
pub use keyboard_types;
pub use msg::constellation_msg::TopLevelBrowsingContextId as BrowserId;
pub use servo_config as config;
pub use servo_url as url;
Expand Down
2 changes: 1 addition & 1 deletion ports/libmlservo/Cargo.toml
Expand Up @@ -13,8 +13,8 @@ test = false
bench = false

[dependencies]
keyboard-types = "0.4"
libservo = { path = "../../components/servo", features = ["no_static_freetype"] }
simpleservo = { path = "../libsimpleservo/api", features = ["no_static_freetype"] }
log = "0.4"
servo-egl = "0.2"
smallvec = "0.6"
Expand Down

0 comments on commit 40e9b84

Please sign in to comment.