Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #4597 : michaelwu/servo/fix-gonk-20150109, r=larsbergstrom

Browse source
This commit is contained in:
bors-servo 2015-01-09 17:18:45 -07:00
commit 5e758b680b
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ports/gonk/.cargo/config
View file

@ -1,3 +1,11 @@
# FIXME: Remove this next rustup. This is a temporary
# hack to allow android cross compilation to work. When
# this is removed, the support/time submodule can also
# be removed!
paths = [
"../../support/time"
]
[target.arm-linux-androideabi] [target.arm-linux-androideabi]
ar = "arm-linux-androideabi-ar" ar = "arm-linux-androideabi-ar"
linker = "arm-linux-androideabi-g++" linker = "arm-linux-androideabi-g++"

2
ports/gonk/src/lib.rs
View file

@ -111,7 +111,7 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
storage_task); storage_task);
// Send the URL command to the constellation. // Send the URL command to the constellation.
let cwd = os::getcwd(); let cwd = os::getcwd().unwrap();
for url in opts.urls.iter() { for url in opts.urls.iter() {
let url = match url::Url::parse(url.as_slice()) { let url = match url::Url::parse(url.as_slice()) {
Ok(url) => url, Ok(url) => url,

3
ports/gonk/src/main.rs
View file

@ -19,7 +19,6 @@ extern crate layers;
extern crate egl; extern crate egl;
use servo_util::opts; use servo_util::opts;
use servo_util::rtinstrument;
use servo::Browser; use servo::Browser;
use compositing::windowing::WindowEvent; use compositing::windowing::WindowEvent;
@ -68,8 +67,6 @@ fn main() {
browser browser
} = browser; } = browser;
browser.shutdown(); browser.shutdown();
rtinstrument::teardown();
} }
} }

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

@ -11,7 +11,7 @@ use geom::size::TypedSize2D;
use layers::geometry::DevicePixel; use layers::geometry::DevicePixel;
use layers::platform::surface::NativeGraphicsMetadata; use layers::platform::surface::NativeGraphicsMetadata;
use libc::c_int; use libc::c_int;
use msg::compositor_msg::{Blank, ReadyState, PaintState}; use msg::compositor_msg::{ReadyState, PaintState};
use msg::constellation_msg::{Key, KeyModifiers}; use msg::constellation_msg::{Key, KeyModifiers};
use msg::constellation_msg::LoadData; use msg::constellation_msg::LoadData;
use std::cell::Cell; use std::cell::Cell;
@ -147,6 +147,7 @@ pub struct hwc_color {
} }
#[repr(C)] #[repr(C)]
#[deriving(Copy)]
pub struct hwc_rect { pub struct hwc_rect {
left: c_int, left: c_int,
top: c_int, top: c_int,
@ -746,7 +747,7 @@ impl Window {
ctx: ctx, ctx: ctx,
surf: eglwindow, surf: eglwindow,
ready_state: Cell::new(Blank), ready_state: Cell::new(ReadyState::Blank),
paint_state: Cell::new(PaintState::Idle), paint_state: Cell::new(PaintState::Idle),
}; };