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

auto merge of #4375 : michaelwu/servo/fix-gonk-20141215, r=glennw

Browse source 
This updates azure to pick up a gonk fix - https://github.com/servo/rust-azure/pull/120 and adds a stub function to the window.
This commit is contained in:
bors-servo 2014-12-15 15:06:59 -07:00
commit d75e85261f
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ports/gonk/Cargo.lock generated
View file

@ -15,7 +15,7 @@ dependencies = [
[[package]] [[package]]
name = "azure" name = "azure"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/rust-azure#e8323588209b47a07b67f61812c75dfeb2ad6851" source = "git+https://github.com/servo/rust-azure#bfae54620eaca34df0ae43d2c1082298131c1aad"
dependencies = [ dependencies = [
"core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)", "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
"core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)", "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",

4
ports/gonk/src/window.rs
View file

@ -13,6 +13,7 @@ use layers::platform::surface::NativeGraphicsMetadata;
use libc::c_int; use libc::c_int;
use msg::compositor_msg::{Blank, IdlePaintState}; use msg::compositor_msg::{Blank, IdlePaintState};
use msg::compositor_msg::{ReadyState, PaintState}; use msg::compositor_msg::{ReadyState, PaintState};
use msg::constellation_msg::{Key, KeyModifiers};
use msg::constellation_msg::LoadData; use msg::constellation_msg::LoadData;
use std::cell::Cell; use std::cell::Cell;
use std::comm::Receiver; use std::comm::Receiver;
@ -810,6 +811,9 @@ impl WindowMethods for Window {
} }
} }
fn handle_key(&self, _: Key, _: KeyModifiers) {
}
fn create_compositor_channel(window: &Option<Rc<Window>>) fn create_compositor_channel(window: &Option<Rc<Window>>)
-> (Box<CompositorProxy+Send>, Box<CompositorReceiver>) { -> (Box<CompositorProxy+Send>, Box<CompositorReceiver>) {
let (sender, receiver) = channel(); let (sender, receiver) = channel();