Address review comments

servo · Dec 7, 2014 · a6747b1 · a6747b1
1 parent 48c9881
commit a6747b1
Show file tree

Hide file tree

Showing 9 changed files with 406 additions and 422 deletions.
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ On Debian-based Linuxes:
 sudo apt-get install curl freeglut3-dev \
     libfreetype6-dev libgl1-mesa-dri libglib2.0-dev xorg-dev \
     msttcorefonts gperf g++ cmake python-virtualenv \
-    libssl-dev
+    libssl-dev libbz2-dev
 ```
 
 On Fedora:

diff --git a/components/script/dom/htmltitleelement.rs b/components/script/dom/htmltitleelement.rs
@@ -79,8 +79,10 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLTitleElement> {
 
     fn bind_to_tree(&self, _: bool) {
         let node: JSRef<Node> = NodeCast::from_ref(*self);
-        let document = node.owner_doc().root();
-        document.send_title_to_compositor()
+        if node.is_in_doc() {
+            let document = node.owner_doc().root();
+            document.send_title_to_compositor()
+        }
     }
 }
 
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
diff --git a/ports/android/.cargo/config b/ports/android/.cargo/config
@@ -1,5 +1,3 @@
-paths = [ "/Users/pcwalton/Source/servo-packages/rust-cocoa" ]
-
 [target.arm-linux-androideabi]
 ar = "arm-linux-androideabi-ar"
 linker = "arm-linux-androideabi-g++"

diff --git a/ports/android/glut_app/Cargo.lock b/ports/android/glut_app/Cargo.lock
diff --git a/ports/android/glut_app/window.rs b/ports/android/glut_app/window.rs
@@ -182,13 +182,6 @@ impl WindowMethods for Window {
 
     /// Sets the render state.
     fn set_render_state(&self, render_state: RenderState) {
-        if self.ready_state.get() == FinishedLoading &&
-            self.render_state.get() == RenderingRenderState &&
-            render_state == IdleRenderState {
-            // page loaded
-            self.event_queue.borrow_mut().push(FinishedWindowEvent);
-        }
-
         self.render_state.set(render_state);
         //FIXME: set_window_title causes crash with Android version of freeGLUT. Temporarily blocked.
         //self.update_window_title()

diff --git a/ports/cef/core.rs b/ports/cef/core.rs
@@ -23,6 +23,9 @@ use std::rt;
 
 const MAX_RENDERING_THREADS: uint = 128;
 
+// TODO(pcwalton): Get the home page via the CEF API.
+static HOME_URL: &'static str = "http://s27.postimg.org/vqbtrolyr/servo.jpg";
+
 // TODO(pcwalton): Support multiple windows.
 pub enum ServoCefGlobals {
     OnScreenGlobals(RefCell<Rc<glfw_app::window::Window>>,
@@ -73,8 +76,7 @@ pub extern "C" fn cef_initialize(args: *const cef_main_args_t,
 
     message_queue.replace(Some(RefCell::new(Vec::new())));
 
-    let mut urls = Vec::new();
-    urls.push("http://s27.postimg.org/vqbtrolyr/servo.jpg".to_string());
+    let mut urls = vec![HOME_URL.to_string()];
     opts::set_opts(opts::Opts {
         urls: urls,
         n_render_threads: 1,