diff options
Diffstat (limited to 'components/script/dom/document.rs')
| -rw-r--r-- | components/script/dom/document.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 89755564bb6..00dec5d995f 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -56,7 +56,7 @@ use dom::htmlembedelement::HTMLEmbedElement; use dom::htmlformelement::HTMLFormElement; use dom::htmlheadelement::HTMLHeadElement; use dom::htmlhtmlelement::HTMLHtmlElement; -use dom::htmliframeelement::{self, HTMLIFrameElement}; +use dom::htmliframeelement::HTMLIFrameElement; use dom::htmlimageelement::HTMLImageElement; use dom::htmllinkelement::HTMLLinkElement; use dom::htmlmetaelement::HTMLMetaElement; @@ -100,7 +100,7 @@ use net_traits::CookieSource::NonHTTP; use net_traits::CoreResourceMsg::{GetCookiesForUrl, SetCookiesForUrl}; use net_traits::response::HttpsState; use net_traits::{AsyncResponseTarget, PendingAsyncLoad, IpcSend}; -use num_traits::{ToPrimitive}; +use num_traits::ToPrimitive; use origin::Origin; use parse::{ParserRoot, ParserRef, MutNullableParserField}; use script_thread::{MainThreadScriptMsg, Runnable}; @@ -127,6 +127,7 @@ use task_source::dom_manipulation::DOMManipulationTask; use time; use url::Url; use url::percent_encoding::percent_decode; +use util::prefs::mozbrowser_enabled; use util::str::{split_html_space_chars, str_join}; #[derive(JSTraceable, PartialEq, HeapSizeOf)] @@ -1228,9 +1229,9 @@ impl Document { self.stylesheets_changed_since_reflow.set(true); *self.stylesheets.borrow_mut() = None; // Mark the document element dirty so a reflow will be performed. - self.get_html_element().map(|root| { - root.upcast::<Node>().dirty(NodeDamage::NodeStyleDamaged); - }); + if let Some(element) = self.GetDocumentElement() { + element.upcast::<Node>().dirty(NodeDamage::NodeStyleDamaged); + } } pub fn get_and_reset_stylesheets_changed_since_reflow(&self) -> bool { @@ -1261,7 +1262,7 @@ impl Document { } pub fn trigger_mozbrowser_event(&self, event: MozBrowserEvent) { - if htmliframeelement::mozbrowser_enabled() { + if mozbrowser_enabled() { if let Some((containing_pipeline_id, subpage_id)) = self.window.parent_info() { let event = ConstellationMsg::MozBrowserEvent(containing_pipeline_id, subpage_id, |