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

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

Browse source
This commit is contained in:
Mike Blumenkrantz 2015-05-29 18:27:00 -04:00
parent 612cefa02d
commit ffa2093012
10 changed files with 32 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/compositing/compositor.rs
View file

@ -458,6 +458,10 @@ impl<Window: WindowMethods> IOCompositor<Window> {
self.window.set_favicon(url); self.window.set_favicon(url);
} }
(Msg::HeadParsed, ShutdownState::NotShuttingDown) => {
self.window.head_parsed();
}
// When we are shutting_down, we need to avoid performing operations // When we are shutting_down, we need to avoid performing operations
// such as Paint that may crash because we have begun tearing down // such as Paint that may crash because we have begun tearing down
// the rest of our resources. // the rest of our resources.

3
components/compositing/compositor_task.rs
View file

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

4
components/compositing/constellation.rs
View file

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

1
components/compositing/headless.rs
View file

@ -110,6 +110,7 @@ impl CompositorEventListener for NullCompositor {
Msg::PaintTaskExited(..) | Msg::PaintTaskExited(..) |
Msg::IsReadyToSaveImageReply(..) => {} Msg::IsReadyToSaveImageReply(..) => {}
Msg::NewFavicon(..) => {} Msg::NewFavicon(..) => {}
Msg::HeadParsed => {}
} }
true true
} }

2
components/compositing/windowing.rs
View file

@ -110,6 +110,8 @@ pub trait WindowMethods {
fn load_end(&self, back: bool, forward: bool); fn load_end(&self, back: bool, forward: bool);
/// Called when the browser encounters an error while loading a URL /// Called when the browser encounters an error while loading a URL
fn load_error(&self, code: NetError, url: String); 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. /// Returns the hidpi factor of the monitor.
fn hidpi_factor(&self) -> ScaleFactor<ScreenPx, DevicePixel, f32>; fn hidpi_factor(&self) -> ScaleFactor<ScreenPx, DevicePixel, f32>;

2
components/msg/constellation_msg.rs
View file

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

5
components/script/dom/htmlbodyelement.rs
View file

@ -17,6 +17,8 @@ use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
use dom::node::{Node, NodeTypeId, window_from_node}; use dom::node::{Node, NodeTypeId, window_from_node};
use dom::virtualmethods::VirtualMethods; use dom::virtualmethods::VirtualMethods;
use dom::window::WindowHelpers; use dom::window::WindowHelpers;
use msg::constellation_msg::ConstellationChan;
use msg::constellation_msg::Msg as ConstellationMsg;
use cssparser::RGBA; use cssparser::RGBA;
use util::str::{self, DOMString}; use util::str::{self, DOMString};
@ -107,6 +109,9 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLBodyElement> {
let window = window_from_node(*self).root(); let window = window_from_node(*self).root();
let document = window.r().Document().root(); let document = window.r().Document().root();
document.r().set_reflow_timeout(time::precise_time_ns() + INITIAL_REFLOW_DELAY); 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>) { fn after_set_attr(&self, attr: JSRef<Attr>) {

3
ports/cef/window.rs
View file

@ -391,6 +391,9 @@ impl WindowMethods for Window {
} }
} }
fn head_parsed(&self) {
}
fn set_page_title(&self, string: Option<String>) { fn set_page_title(&self, string: Option<String>) {
let browser = self.cef_browser.borrow(); let browser = self.cef_browser.borrow();
let browser = match *browser { let browser = match *browser {

5
ports/glutin/window.rs
View file

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

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

@ -812,6 +812,9 @@ impl WindowMethods for Window {
fn load_error(&self, _: NetError, _: String) { fn load_error(&self, _: NetError, _: String) {
} }
fn head_parsed(&self) {
}
fn hidpi_factor(&self) -> ScaleFactor<ScreenPx, DevicePixel, f32> { fn hidpi_factor(&self) -> ScaleFactor<ScreenPx, DevicePixel, f32> {
ScaleFactor::new(1.0) ScaleFactor::new(1.0)
} }