Auto merge of #7911 - Qeole:7907, r=jdm

Fixes #7907: rendering for unescaped string "<iframe>" in doc



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7911)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-10-07 13:59:24 -06:00
commit 3e5b491a50

View file

@ -307,30 +307,30 @@ pub enum AnimationState {
// https://developer.mozilla.org/en-US/docs/Web/API/Using_the_Browser_API#Events // https://developer.mozilla.org/en-US/docs/Web/API/Using_the_Browser_API#Events
#[derive(Deserialize, Serialize)] #[derive(Deserialize, Serialize)]
pub enum MozBrowserEvent { pub enum MozBrowserEvent {
/// Sent when the scroll position within a browser <iframe> changes. /// Sent when the scroll position within a browser `<iframe>` changes.
AsyncScroll, AsyncScroll,
/// Sent when window.close() is called within a browser <iframe>. /// Sent when window.close() is called within a browser `<iframe>`.
Close, Close,
/// Sent when a browser <iframe> tries to open a context menu. This allows /// Sent when a browser `<iframe>` tries to open a context menu. This allows
/// handling <menuitem> element available within the browser <iframe>'s content. /// handling `<menuitem>` element available within the browser `<iframe>`'s content.
ContextMenu, ContextMenu,
/// Sent when an error occurred while trying to load content within a browser <iframe>. /// Sent when an error occurred while trying to load content within a browser `<iframe>`.
Error, Error,
/// Sent when the favicon of a browser <iframe> changes. /// Sent when the favicon of a browser `<iframe>` changes.
IconChange, IconChange,
/// Sent when the browser <iframe> has finished loading all its assets. /// Sent when the browser `<iframe>` has finished loading all its assets.
LoadEnd, LoadEnd,
/// Sent when the browser <iframe> starts to load a new page. /// Sent when the browser `<iframe>` starts to load a new page.
LoadStart, LoadStart,
/// Sent when a browser <iframe>'s location changes. /// Sent when a browser `<iframe>`'s location changes.
LocationChange(String), LocationChange(String),
/// Sent when window.open() is called within a browser <iframe>. /// Sent when window.open() is called within a browser `<iframe>`.
OpenWindow, OpenWindow,
/// Sent when the SSL state changes within a browser <iframe>. /// Sent when the SSL state changes within a browser `<iframe>`.
SecurityChange, SecurityChange,
/// Sent when alert(), confirm(), or prompt() is called within a browser <iframe>. /// Sent when alert(), confirm(), or prompt() is called within a browser `<iframe>`.
ShowModalPrompt, ShowModalPrompt,
/// Sent when the document.title changes within a browser <iframe>. /// Sent when the document.title changes within a browser `<iframe>`.
TitleChange(String), TitleChange(String),
/// Sent when an HTTP authentification is requested. /// Sent when an HTTP authentification is requested.
UsernameAndPasswordRequired, UsernameAndPasswordRequired,