Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-24 22:58:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update rustc to revision 3dcd2157403163789aaf21a9ab3c4d30a7c6494d.

Browse source
This commit is contained in:
Ms2ger 2014-12-17 10:42:52 +01:00 • committed by Josh Matthews
parent b8900782b0
commit 466faac2a5
223 changed files with 4414 additions and 4105 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ports/cef/core.rs
View file

@ -7,7 +7,7 @@ use interfaces::cef_app_t;
use types::{cef_main_args_t, cef_settings_t};
use window;
use compositing::windowing::{IdleWindowEvent, WindowEvent};
use compositing::windowing::WindowEvent;
use geom::size::TypedSize2D;
use glfw_app;
use libc::{c_char, c_int, c_void};
@ -141,10 +141,10 @@ pub extern "C" fn cef_run_message_loop() {
let mut the_globals = globals.get();
let the_globals = the_globals.as_mut().unwrap();
match **the_globals {
OnScreenGlobals(ref window, ref browser) => {
ServoCefGlobals::OnScreenGlobals(ref window, ref browser) => {
while browser.borrow_mut().handle_event(window.borrow_mut().wait_events()) {}
}
OffScreenGlobals(ref window, ref browser) => {
ServoCefGlobals::OffScreenGlobals(ref window, ref browser) => {
while browser.borrow_mut().handle_event(window.borrow_mut().wait_events()) {}
}
}
@ -152,7 +152,7 @@ pub extern "C" fn cef_run_message_loop() {
#[no_mangle]
pub extern "C" fn cef_do_message_loop_work() {
send_window_event(IdleWindowEvent)
send_window_event(WindowEvent::Idle)
}
#[no_mangle]
@ -177,7 +177,7 @@ pub fn send_window_event(event: WindowEvent) {
};
loop {
match **the_globals {
OnScreenGlobals(_, ref browser) => {
ServoCefGlobals::OnScreenGlobals(_, ref browser) => {
match browser.try_borrow_mut() {
None => {
// We're trying to send an event while processing another one. This will
@ -198,7 +198,7 @@ pub fn send_window_event(event: WindowEvent) {
}
}
}
OffScreenGlobals(_, ref browser) => {
ServoCefGlobals::OffScreenGlobals(_, ref browser) => {
match browser.try_borrow_mut() {
None => {
// We're trying to send an event while processing another one. This will
@ -233,8 +233,8 @@ macro_rules! browser_method_delegate(
Some(the_globals) => the_globals,
};
match **the_globals {
OnScreenGlobals(_, ref browser) => browser.borrow_mut().$method(),
OffScreenGlobals(_, ref browser) => browser.borrow_mut().$method(),
ServoCefGlobals::OnScreenGlobals(_, ref browser) => browser.borrow_mut().$method(),
ServoCefGlobals::OffScreenGlobals(_, ref browser) => browser.borrow_mut().$method(),
}
}
)*