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

ports/gonk/.cargo/config

@@ -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]
 ar = "arm-linux-androideabi-ar"
 linker = "arm-linux-androideabi-g++"

ports/gonk/src/lib.rs

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

ports/gonk/src/main.rs

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

ports/gonk/src/window.rs

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