Use simpleservo embedding API for Magic Leap #22871

jdm · 2019-02-12T23:10:56Z

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

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

This change is


        Add IME callback for embedders.

highfive · 2019-02-12T23:11:01Z

Heads up! This PR modifies the following files:

@paulrouget: components/servo/Cargo.toml, components/servo/lib.rs

highfive · 2019-02-12T23:11:02Z

Warning

These commits modify unsafe code. Please review it carefully!

jdm · 2019-02-12T23:11:35Z

r? @asajeffrey
Paul already signed off on the non-ML changes in #22065 (comment).

asajeffrey · 2019-02-13T00:03:23Z

My hot take is that this is much nicer. I'll have a less-hot take tomorrow.

asajeffrey

OK, this looks much much nicer. The use of the SERVO global variable is not what I would do, but everything else is much nicer.

asajeffrey · 2019-02-13T14:33:58Z

ports/libmlservo/src/lib.rs

@@ -101,6 +84,16 @@ pub struct MLApp(*mut c_void);

 const LOG_LEVEL: log::LevelFilter = log::LevelFilter::Info;

+fn call<F>(f: F) -> Result<(), &'static str>


Parameterize this over the return type?

asajeffrey · 2019-02-13T14:33:58Z

ports/libmlservo/src/lib.rs


+    let gl = gl_glue::egl::init().expect("EGL initialization failure");
    info!("OpenGL version {}", gl.get_string(gl::VERSION));


I think we can get rid of this info!, it was useful while debugging but not any more.

asajeffrey · 2019-02-13T14:33:58Z

ports/libmlservo/src/lib.rs

+where
+    F: FnOnce(&mut ServoGlue) -> Result<(), &'static str>,
+{
+    SERVO.with(|s| match s.borrow_mut().as_mut() {


Sigh, libsimpleservo uses a global variable? This is a bit of a step back, libmlservo passed the servo instance around as a parameter.

I'll file a followup issue to discuss this choice.

jdm · 2019-03-01T20:49:06Z

@bors-servo r=paul,asajeffrey

bors-servo · 2019-03-01T20:49:07Z

📌 Commit 176e722 has been approved by paul,asajeffrey

bors-servo · 2019-03-01T22:19:07Z

⌛ Testing commit 176e722 with merge 40e9b84...


        Auto merge of #22871 - jdm:simpleml, r=paul,asajeffrey

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.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22871)

bors-servo · 2019-03-01T22:33:36Z

💔 Test failed - magicleap

jdm · 2019-03-04T14:19:21Z

@bors-servo r=ajeffrey,paul

bors-servo · 2019-03-04T14:24:28Z

⌛ Testing commit 7b19eec with merge 5a044f4...


        Auto merge of #22871 - jdm:simpleml, r=ajeffrey,paul

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.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22871)

bors-servo · 2019-03-04T14:46:01Z

💔 Test failed - linux-rel-css

jdm · 2019-03-04T15:29:47Z

@bors-servo retry

#21067

bors-servo · 2019-03-04T17:08:31Z

⌛ Testing commit 7b19eec with merge d566102...


        Auto merge of #22871 - jdm:simpleml, r=ajeffrey,paul

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.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22871)

bors-servo · 2019-03-04T17:38:51Z

💔 Test failed - android-mac


        Remove unnecessary layers of casting from embedding event API.


        Add key and mouse input APIs to simpleservo.


        Build MagicLeap port using libsimpleservo.

jdm · 2019-03-04T17:45:54Z

@bors-servo r=ajeffrey,paul

bors-servo · 2019-03-04T17:45:55Z

📌 Commit 5b7be25 has been approved by ajeffrey,paul

bors-servo · 2019-03-04T18:46:30Z

⌛ Testing commit 5b7be25 with merge cfb401e...


        Auto merge of #22871 - jdm:simpleml, r=ajeffrey,paul

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.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22871)

bors-servo · 2019-03-04T20:14:23Z

☀️ 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: ajeffrey,paul
Pushing cfb401e to master...

Add IME callback for embedders.

256011a

jdm force-pushed the jdm:simpleml branch from 6fb3db3 to 1936da3 Feb 12, 2019

highfive assigned ferjm Feb 12, 2019

highfive added the S-awaiting-review label Feb 12, 2019

highfive assigned asajeffrey and unassigned ferjm Feb 12, 2019

asajeffrey approved these changes Feb 13, 2019

View changes

asajeffrey added S-needs-squash and removed S-awaiting-review labels Feb 13, 2019

jdm force-pushed the jdm:simpleml branch from 1936da3 to 176e722 Mar 1, 2019

highfive added the S-awaiting-review label Mar 1, 2019

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-squash labels Mar 1, 2019

highfive added S-tests-failed and removed S-awaiting-merge labels Mar 1, 2019

jdm mentioned this pull request Mar 4, 2019

Can we avoid the SERVO global in libsimpleservo? #22967

Open

jdm force-pushed the jdm:simpleml branch from 176e722 to 7b19eec Mar 4, 2019

highfive added S-awaiting-review and removed S-tests-failed labels Mar 4, 2019

highfive added the S-awaiting-merge label Mar 4, 2019

highfive added S-tests-failed and removed S-awaiting-merge labels Mar 4, 2019

highfive added S-awaiting-merge and removed S-tests-failed labels Mar 4, 2019

highfive added S-tests-failed and removed S-awaiting-merge labels Mar 4, 2019

jdm added 3 commits Jan 22, 2019

Remove unnecessary layers of casting from embedding event API.

981f741

Add key and mouse input APIs to simpleservo.

887333a

Build MagicLeap port using libsimpleservo.

Loading status checks…

5b7be25

jdm force-pushed the jdm:simpleml branch from 7b19eec to 5b7be25 Mar 4, 2019

highfive added S-awaiting-review and removed S-tests-failed labels Mar 4, 2019

highfive added S-awaiting-merge and removed S-awaiting-review labels Mar 4, 2019

highfive removed the S-awaiting-merge label Mar 4, 2019

jdm mentioned this pull request Mar 6, 2019

DuckDuckGo search box does not bring up keyboard input on ML #22983

Open

servo / servo

Use simpleservo embedding API for Magic Leap #22871

Use simpleservo embedding API for Magic Leap #22871

jdm commented Feb 12, 2019 •

edited by SimonSapin

highfive commented Feb 12, 2019

highfive commented Feb 12, 2019

jdm commented Feb 12, 2019

asajeffrey commented Feb 13, 2019

asajeffrey left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

jdm commented Mar 1, 2019

bors-servo commented Mar 1, 2019

bors-servo commented Mar 1, 2019

bors-servo commented Mar 1, 2019

jdm commented Mar 4, 2019

bors-servo commented Mar 4, 2019

bors-servo commented Mar 4, 2019

jdm commented Mar 4, 2019

bors-servo commented Mar 4, 2019

bors-servo commented Mar 4, 2019

jdm commented Mar 4, 2019

bors-servo commented Mar 4, 2019

bors-servo commented Mar 4, 2019

bors-servo commented Mar 4, 2019

		@@ -101,6 +84,16 @@ pub struct MLApp(*mut c_void);

		const LOG_LEVEL: log::LevelFilter = log::LevelFilter::Info;

		fn call<F>(f: F) -> Result<(), &'static str>


		let gl = gl_glue::egl::init().expect("EGL initialization failure");
		info!("OpenGL version {}", gl.get_string(gl::VERSION));

servo / servo

Join GitHub today

Use simpleservo embedding API for Magic Leap #22871

Use simpleservo embedding API for Magic Leap #22871

Conversation

jdm commented Feb 12, 2019 • edited by SimonSapin

highfive commented Feb 12, 2019

highfive commented Feb 12, 2019

jdm commented Feb 12, 2019

asajeffrey commented Feb 13, 2019

asajeffrey left a comment

This comment has been minimized.

asajeffrey Feb 13, 2019

This comment has been minimized.

asajeffrey Feb 13, 2019

This comment has been minimized.

asajeffrey Feb 13, 2019

This comment has been minimized.

jdm Mar 1, 2019

jdm commented Mar 1, 2019

bors-servo commented Mar 1, 2019

bors-servo commented Mar 1, 2019

bors-servo commented Mar 1, 2019

jdm commented Mar 4, 2019

bors-servo commented Mar 4, 2019

bors-servo commented Mar 4, 2019

jdm commented Mar 4, 2019

bors-servo commented Mar 4, 2019

bors-servo commented Mar 4, 2019

jdm commented Mar 4, 2019

bors-servo commented Mar 4, 2019

bors-servo commented Mar 4, 2019

bors-servo commented Mar 4, 2019

jdm commented Feb 12, 2019 •

edited by SimonSapin