зеркало из https://github.com/mozilla/gecko-dev.git
servo: Merge #4316 - Make the gonk port work again (from michaelwu:fix-gonk); r=glennw
This makes the gonk port build/work again after the recent CEF port update. Source-Repo: https://github.com/servo/servo Source-Revision: 5b53d5a163fb8b32e109d5dea4eddddf64caad08
This commit is contained in:
Родитель
ecf4a03a01
Коммит
87f75259e4
|
@ -28,6 +28,7 @@ use servo_util::opts;
|
|||
use servo_util::rtinstrument;
|
||||
use servo::Browser;
|
||||
use compositing::windowing::IdleWindowEvent;
|
||||
use compositing::windowing::InitializeCompositingWindowEvent;
|
||||
|
||||
use std::os;
|
||||
|
||||
|
@ -58,6 +59,8 @@ fn start(argc: int, argv: *const *const u8) -> int {
|
|||
Some(ref window) => input::run_input_loop(&window.event_send)
|
||||
}
|
||||
|
||||
browser.browser.handle_event(InitializeCompositingWindowEvent);
|
||||
|
||||
loop {
|
||||
let should_continue = match window {
|
||||
None => browser.browser.handle_event(IdleWindowEvent),
|
||||
|
|
|
@ -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::LoadData;
|
||||
use std::cell::Cell;
|
||||
use std::comm::Receiver;
|
||||
use std::rc::Rc;
|
||||
|
@ -790,6 +791,15 @@ impl WindowMethods for Window {
|
|||
self.paint_state.set(paint_state);
|
||||
}
|
||||
|
||||
fn set_page_title(&self, _: Option<String>) {
|
||||
}
|
||||
|
||||
fn set_page_load_data(&self, _: LoadData) {
|
||||
}
|
||||
|
||||
fn load_end(&self) {
|
||||
}
|
||||
|
||||
fn hidpi_factor(&self) -> ScaleFactor<ScreenPx, DevicePixel, f32> {
|
||||
ScaleFactor(1.0)
|
||||
}
|
||||
|
@ -809,6 +819,10 @@ impl WindowMethods for Window {
|
|||
} as Box<CompositorProxy+Send>,
|
||||
box receiver as Box<CompositorReceiver>)
|
||||
}
|
||||
|
||||
fn prepare_for_composite(&self) -> bool {
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
struct GonkCompositorProxy {
|
||||
|
|
Загрузка…
Ссылка в новой задаче