Embedding windowing

[zmike]

Depends on glutin PR #21

@glennw @larsbergstrom

[highfive]

Warning

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

[hoppipolla-critic-bot]

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

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.

[bors-servo]

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

[larsbergstrom]

Reviewed files:

• ports/cef/browser.rs @ r6
• ports/cef/browser_host.rs @ r6
• ports/cef/core.rs @ r4
• ports/glutin/window.rs @ r6

---

Comments from the review on Reviewable.io

[larsbergstrom]

Does this also need an update to the CEF lock file for the updated glutin with landed commit? I believe you can do so with:

./mach update-cargo -p glutin

Also, waiting to approve until you resolve the URL-related changes you wanted to make.

[zmike]

I'll answer all these questions in about 4 hours when this test compile finishes.

[zmike]

We can just say this depends on #5995 now

[larsbergstrom]

This is r=me once #5995 lands

[larsbergstrom]

@bors-servo: r+

[bors-servo]

📌 Commit 6c32998 has been approved by larsbergstrom

[bors-servo]

⌛ Testing commit 6c32998 with merge da27b07...

[bors-servo]

💔 Test failed - mac2

[jdm]

The reftest failure is #5958. However:

browser.rs:105:54: 105:55 error: mismatched types:
 expected `*mut libc::types::common::c95::c_void`,
    found `usize`
(expected *-ptr,
    found usize) [E0308]
browser.rs:105         let mut window_handle: cef_window_handle_t = 0;
                                                                    ^
browser.rs:151:41: 151:42 error: mismatched types:
 expected `*mut libc::types::common::c95::c_void`,
    found `usize`
(expected *-ptr,
    found usize) [E0308]
browser.rs:151         if window_info.parent_window != 0 {
                                                       ^
error: aborting due to 2 previous errors
Could not compile `embedding`.

[zmike]

Argh! Well I can't compile for macos, so I guess I'll keep putting updates into the branch to see if it compiles.

[zmike]

@jdm Try now I guess?

[jdm]

Any reason why you didn't initialize it to ptr::mut_null() and check .is_null()?

[jdm]

Nevermind, this looks like it would work too.

[jdm]

@bors-servo: r+

[bors-servo]

📌 Commit c254f9c has been approved by jdm

[bors-servo]

⌛ Testing commit c254f9c with merge 57a5a09...

[zmike]

On linux it's an int type, not a ptr.

[bors-servo]

💔 Test failed - mac2

[jdm]

browser.rs:105:54: 105:70 error: the trait `core::default::Default` is not implemented for the type `*mut libc::types::common::c95::c_void` [E0277]
browser.rs:105         let mut window_handle: cef_window_handle_t = Default::default();
                                                                    ^~~~~~~~~~~~~~~~

[zmike]

I tried doing per-platform initialization using [cfg(target_os... lines, but, I get errors like

browser.rs:107:25: 107:26 error: expected item after attributes
browser.rs:107 #[cfg(target_os="macos")]

Suggestions?

[jdm]

There's if cfg!(...) you can use for that instead.

[larsbergstrom]

@bors-servo: r+

[bors-servo]

📌 Commit 6f6945a has been approved by larsbergstrom

[bors-servo]

⌛ Testing commit 6f6945a with merge a97f81b...

[bors-servo]

☀️ Test successful - android, gonk, linux1, linux2, mac1, mac2