add window method for notifying when the <head> tag has been parsed

servo · Jun 3, 2015 · ffa2093 · ffa2093
1 parent 612cefa
commit ffa2093
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 0 deletions.
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
@@ -458,6 +458,10 @@ impl<Window: WindowMethods> IOCompositor<Window> {
                 self.window.set_favicon(url);
             }
 
+            (Msg::HeadParsed, ShutdownState::NotShuttingDown) => {
+                self.window.head_parsed();
+            }
+
             // When we are shutting_down, we need to avoid performing operations
             // such as Paint that may crash because we have begun tearing down
             // the rest of our resources.

diff --git a/components/compositing/compositor_task.rs b/components/compositing/compositor_task.rs
@@ -182,6 +182,8 @@ pub enum Msg {
     IsReadyToSaveImageReply(bool),
     /// A favicon was detected
     NewFavicon(Url),
+    /// <head> tag finished parsing
+    HeadParsed,
 }
 
 impl Debug for Msg {
@@ -209,6 +211,7 @@ impl Debug for Msg {
             Msg::ViewportConstrained(..) => write!(f, "ViewportConstrained"),
             Msg::IsReadyToSaveImageReply(..) => write!(f, "IsReadyToSaveImageReply"),
             Msg::NewFavicon(..) => write!(f, "NewFavicon"),
+            Msg::HeadParsed => write!(f, "HeadParsed"),
         }
     }
 }

diff --git a/components/compositing/constellation.rs b/components/compositing/constellation.rs
@@ -472,6 +472,10 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
                 debug!("constellation got new favicon message");
                 self.compositor_proxy.send(CompositorMsg::NewFavicon(url));
             }
+            ConstellationMsg::HeadParsed => {
+                debug!("constellation got head parsed message");
+                self.compositor_proxy.send(CompositorMsg::HeadParsed);
+            }
         }
         true
     }

diff --git a/components/compositing/headless.rs b/components/compositing/headless.rs
@@ -110,6 +110,7 @@ impl CompositorEventListener for NullCompositor {
             Msg::PaintTaskExited(..) |
             Msg::IsReadyToSaveImageReply(..) => {}
             Msg::NewFavicon(..) => {}
+            Msg::HeadParsed => {}
         }
         true
     }

diff --git a/components/compositing/windowing.rs b/components/compositing/windowing.rs
@@ -110,6 +110,8 @@ pub trait WindowMethods {
     fn load_end(&self, back: bool, forward: bool);
     /// Called when the browser encounters an error while loading a URL
     fn load_error(&self, code: NetError, url: String);
+    /// Called when the <head> tag has finished parsing
+    fn head_parsed(&self);
 
     /// Returns the hidpi factor of the monitor.
     fn hidpi_factor(&self) -> ScaleFactor<ScreenPx, DevicePixel, f32>;

diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs
@@ -250,6 +250,8 @@ pub enum Msg {
     RemoveIFrame(PipelineId, SubpageId),
     /// Favicon detected
     NewFavicon(Url),
+    /// <head> tag finished parsing
+    HeadParsed,
 }
 
 #[derive(Clone, Eq, PartialEq)]

diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs
@@ -17,6 +17,8 @@ use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId, window_from_node};
 use dom::virtualmethods::VirtualMethods;
 use dom::window::WindowHelpers;
+use msg::constellation_msg::ConstellationChan;
+use msg::constellation_msg::Msg as ConstellationMsg;
 
 use cssparser::RGBA;
 use util::str::{self, DOMString};
@@ -107,6 +109,9 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLBodyElement> {
         let window = window_from_node(*self).root();
         let document = window.r().Document().root();
         document.r().set_reflow_timeout(time::precise_time_ns() + INITIAL_REFLOW_DELAY);
+        let ConstellationChan(ref chan) = window.r().constellation_chan();
+        let event = ConstellationMsg::HeadParsed;
+        chan.send(event).unwrap();
     }
 
     fn after_set_attr(&self, attr: JSRef<Attr>) {

diff --git a/ports/cef/window.rs b/ports/cef/window.rs
@@ -391,6 +391,9 @@ impl WindowMethods for Window {
         }
     }
 
+    fn head_parsed(&self) {
+    }
+
     fn set_page_title(&self, string: Option<String>) {
         let browser = self.cef_browser.borrow();
         let browser = match *browser {

diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs
@@ -515,6 +515,9 @@ impl WindowMethods for Window {
     fn load_error(&self, _: NetError, _: String) {
     }
 
+    fn head_parsed(&self) {
+    }
+
     /// Has no effect on Android.
     fn set_cursor(&self, c: Cursor) {
         use glutin::MouseCursor;
@@ -706,6 +709,8 @@ impl WindowMethods for Window {
     }
     fn load_error(&self, _: NetError, _: String) {
     }
+    fn head_parsed(&self) {
+    }
 
     fn set_cursor(&self, _: Cursor) {
     }

diff --git a/ports/gonk/src/window.rs b/ports/gonk/src/window.rs
@@ -812,6 +812,9 @@ impl WindowMethods for Window {
     fn load_error(&self, _: NetError, _: String) {
     }
 
+    fn head_parsed(&self) {
+    }
+
     fn hidpi_factor(&self) -> ScaleFactor<ScreenPx, DevicePixel, f32> {
         ScaleFactor::new(1.0)
     }