Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

try fixing macos embedding build

Browse source
This commit is contained in:
Mike Blumenkrantz 2015-05-13 22:18:54 -04:00
parent 6c32998100
commit 6f6945aafc
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ports/cef/browser.rs
View file

@ -102,7 +102,7 @@ impl ServoCefBrowser {
pub fn new(window_info: &cef_window_info_t, client: CefClient) -> ServoCefBrowser { pub fn new(window_info: &cef_window_info_t, client: CefClient) -> ServoCefBrowser {
let frame = ServoCefFrame::new().as_cef_interface(); let frame = ServoCefFrame::new().as_cef_interface();
let host = ServoCefBrowserHost::new(client.clone()).as_cef_interface(); let host = ServoCefBrowserHost::new(client.clone()).as_cef_interface();
let mut window_handle: cef_window_handle_t = 0; let mut window_handle: cef_window_handle_t = get_null_window_handle();
let servo_browser = if window_info.windowless_rendering_enabled == 0 { let servo_browser = if window_info.windowless_rendering_enabled == 0 {
let glutin_window = glutin_app::create_window(); let glutin_window = glutin_app::create_window();
@ -148,7 +148,7 @@ impl ServoCefBrowserExtensions for CefBrowser {
self.downcast().host.set_browser((*self).clone()); self.downcast().host.set_browser((*self).clone());
self.downcast().frame.set_browser((*self).clone()); self.downcast().frame.set_browser((*self).clone());
if window_info.parent_window != 0 { if window_info.windowless_rendering_enabled == 0 {
self.downcast().host.initialize_compositing(); self.downcast().host.initialize_compositing();
} }
} }
@ -184,6 +184,15 @@ impl ServoCefBrowserExtensions for CefBrowser {
} }
} }
#[cfg(target_os="macos")]
pub fn get_null_window_handle() -> cef_window_handle_t {
ptr::null_mut()
}
#[cfg(target_os="linux")]
pub fn get_null_window_handle() -> cef_window_handle_t {
0
}
pub fn update() { pub fn update() {
BROWSERS.with(|browsers| { BROWSERS.with(|browsers| {
for browser in browsers.borrow().iter() { for browser in browsers.borrow().iter() {