servo: Merge #4375 - Fix gonk 20141215 (from michaelwu:fix-gonk-20141215); r=glennw

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.

Source-Repo: https://github.com/servo/servo
Source-Revision: d75e85261fd777405482e1a194dff1b5111808d7
This commit is contained in:
Michael Wu 2014-12-15 15:06:59 -07:00
Родитель a3f69010d3
Коммит b7c00db2cb
2 изменённых файлов: 5 добавлений и 1 удалений

2
servo/ports/gonk/Cargo.lock сгенерированный
Просмотреть файл

@ -15,7 +15,7 @@ dependencies = [
[[package]]
name = "azure"
version = "0.1.0"
source = "git+https://github.com/servo/rust-azure#e8323588209b47a07b67f61812c75dfeb2ad6851"
source = "git+https://github.com/servo/rust-azure#bfae54620eaca34df0ae43d2c1082298131c1aad"
dependencies = [
"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)",

Просмотреть файл

@ -13,6 +13,7 @@ use layers::platform::surface::NativeGraphicsMetadata;
use libc::c_int;
use msg::compositor_msg::{Blank, IdlePaintState};
use msg::compositor_msg::{ReadyState, PaintState};
use msg::constellation_msg::{Key, KeyModifiers};
use msg::constellation_msg::LoadData;
use std::cell::Cell;
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>>)
-> (Box<CompositorProxy+Send>, Box<CompositorReceiver>) {
let (sender, receiver) = channel();