diff --git a/ports/cef/cookie.rs b/ports/cef/cookie.rs index 34aae98b594..a710b70833c 100644 --- a/ports/cef/cookie.rs +++ b/ports/cef/cookie.rs @@ -2,15 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use interfaces::cef_cookie_manager_t; +use interfaces::{cef_completion_callback_t, cef_cookie_manager_t}; use types::cef_string_t; use libc::c_int; cef_stub_static_method_impls! { - fn cef_cookie_manager_get_global_manager() -> *mut cef_cookie_manager_t + fn cef_cookie_manager_get_global_manager(callback: *mut cef_completion_callback_t) -> *mut cef_cookie_manager_t fn cef_cookie_manager_create_manager(path: *const cef_string_t, - persist_session_cookies: c_int) + persist_session_cookies: c_int, + callback: *mut cef_completion_callback_t) -> *mut cef_cookie_manager_t } diff --git a/ports/cef/request_context.rs b/ports/cef/request_context.rs index d5b01f08b08..2187e32b8f6 100644 --- a/ports/cef/request_context.rs +++ b/ports/cef/request_context.rs @@ -2,11 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use interfaces::{cef_request_context_handler_t, cef_request_context_t}; +use interfaces::{cef_request_context_handler_t, cef_request_context_t, cef_request_context_settings_t}; cef_stub_static_method_impls! { fn cef_request_context_get_global_context() -> *mut cef_request_context_t - fn cef_request_context_create_context(_handler: *mut cef_request_context_handler_t) + fn cef_request_context_create_context(_settings: *const cef_request_context_settings_t, + _handler: *mut cef_request_context_handler_t) + -> *mut cef_request_context_t + fn cef_request_context_create_context_shared(_other: *mut cef_request_context_t, + _handler: *mut cef_request_context_handler_t) -> *mut cef_request_context_t } diff --git a/ports/cef/urlrequest.rs b/ports/cef/urlrequest.rs index 77938e858b6..99d8cb53eee 100644 --- a/ports/cef/urlrequest.rs +++ b/ports/cef/urlrequest.rs @@ -2,11 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use interfaces::{cef_request_t, cef_urlrequest_client_t, cef_urlrequest_t}; +use interfaces::{cef_request_t, cef_request_context_t, cef_urlrequest_client_t, cef_urlrequest_t}; #[no_mangle] pub extern "C" fn cef_urlrequest_create(_request: *mut cef_request_t, - _client: *mut cef_urlrequest_client_t) + _client: *mut cef_urlrequest_client_t, + _context: *mut cef_request_context_t) -> *mut cef_urlrequest_t { 0 as *mut cef_urlrequest_t } diff --git a/ports/cef/values.rs b/ports/cef/values.rs index 29ad0b6dfdc..b7779699db0 100644 --- a/ports/cef/values.rs +++ b/ports/cef/values.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use interfaces::{cef_binary_value_t, cef_dictionary_value_t, cef_list_value_t}; +use interfaces::{cef_binary_value_t, cef_dictionary_value_t, cef_list_value_t, cef_value_t}; use libc; @@ -10,5 +10,6 @@ cef_stub_static_method_impls! { fn cef_binary_value_create(_data: *const (), _size: libc::size_t) -> *mut cef_binary_value_t fn cef_dictionary_value_create() -> *mut cef_dictionary_value_t fn cef_list_value_create() -> *mut cef_list_value_t + fn cef_value_create() -> *mut cef_value_t } diff --git a/ports/cef/window.rs b/ports/cef/window.rs index 90740c54622..2c8cf2a71c6 100644 --- a/ports/cef/window.rs +++ b/ports/cef/window.rs @@ -11,7 +11,7 @@ use eutil::Downcast; use interfaces::CefBrowser; use render_handler::CefRenderHandlerExtensions; use rustc_unicode::str::Utf16Encoder; -use types::{cef_cursor_handle_t, cef_rect_t}; +use types::{cef_cursor_handle_t, cef_cursor_type_t, cef_rect_t}; use compositing::compositor_task::{self, CompositorProxy, CompositorReceiver}; use compositing::windowing::{WindowEvent, WindowMethods}; @@ -307,15 +307,18 @@ impl WindowMethods for Window { } fn set_cursor(&self, cursor: Cursor) { + use types::{CefCursorInfo,cef_point_t,cef_size_t}; let browser = self.cef_browser.borrow(); match *browser { None => {} Some(ref browser) => { let cursor_handle = self.cursor_handle_for_cursor(cursor); + let info = CefCursorInfo { hotspot: cef_point_t {x: 0, y: 0}, image_scale_factor: 0.0, buffer: 0 as *mut isize, size: cef_size_t { width: 0, height: 0 } }; browser.get_host() .get_client() .get_render_handler() - .on_cursor_change(browser.clone(), cursor_handle) + .on_cursor_change(browser.clone(), cursor_handle, + CT_POINTER, &info) } } }