diff options
author | Ms2ger <ms2ger@gmail.com> | 2014-06-11 22:57:54 +0200 |
---|---|---|
committer | Ms2ger <ms2ger@gmail.com> | 2014-06-11 22:57:54 +0200 |
commit | ed333ad8c3a6d23ad156a7e588f637112f79dfe8 (patch) | |
tree | 2f9c4e7b5bb6aa2df735a0a72657781c1b00162a /src | |
parent | 687722da2d2f63800d364326cf1e8a5ce5499830 (diff) | |
download | servo-ed333ad8c3a6d23ad156a7e588f637112f79dfe8.tar.gz servo-ed333ad8c3a6d23ad156a7e588f637112f79dfe8.zip |
Pass immutable document to parse_html.
Diffstat (limited to 'src')
-rw-r--r-- | src/components/script/html/hubbub_html_parser.rs | 10 | ||||
-rw-r--r-- | src/components/script/script_task.rs | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs index c7629958d33..15fa445bb9d 100644 --- a/src/components/script/html/hubbub_html_parser.rs +++ b/src/components/script/html/hubbub_html_parser.rs @@ -291,7 +291,7 @@ pub fn build_element_from_tag(tag: DOMString, ns: Namespace, document: &JSRef<Do } pub fn parse_html(page: &Page, - document: &mut JSRef<Document>, + document: &JSRef<Document>, url: Url, resource_task: ResourceTask) -> HtmlParserResult { @@ -485,15 +485,15 @@ pub fn parse_html(page: &Page, set_quirks_mode: |mode| { debug!("set quirks mode"); // NOTE: tmp vars are workaround for lifetime issues. Both required. - let mut tmp_borrow = doc_cell.borrow_mut(); - let tmp = &mut *tmp_borrow; + let tmp_borrow = doc_cell.borrow_mut(); + let tmp = &*tmp_borrow; tmp.set_quirks_mode(mode); }, encoding_change: |encname| { debug!("encoding change"); // NOTE: tmp vars are workaround for lifetime issues. Both required. - let mut tmp_borrow = doc_cell.borrow_mut(); - let tmp = &mut *tmp_borrow; + let tmp_borrow = doc_cell.borrow_mut(); + let tmp = &*tmp_borrow; tmp.set_encoding_name(encname); }, complete_script: |script| { diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs index adcbd050ee8..f28044a7102 100644 --- a/src/components/script/script_task.rs +++ b/src/components/script/script_task.rs @@ -947,7 +947,7 @@ impl ScriptTask { self.chan.clone(), self.compositor.dup(), self.image_cache_task.clone()).root(); - let mut document = Document::new(&*window, Some(url.clone()), HTMLDocument, None).root(); + let document = Document::new(&*window, Some(url.clone()), HTMLDocument, None).root(); window.deref().init_browser_context(&*document); with_compartment((**cx).ptr, window.reflector().get_jsobject(), || { @@ -960,7 +960,7 @@ impl ScriptTask { // // Note: We can parse the next document in parallel with any previous documents. let html_parsing_result = hubbub_html_parser::parse_html(&*page, - &mut *document, + &*document, url.clone(), self.resource_task.clone()); @@ -998,7 +998,7 @@ impl ScriptTask { } // Kick off the initial reflow of the page. - document.content_changed(); + document.deref().content_changed(); let fragment = url.fragment.as_ref().map(|ref fragment| fragment.to_string()); |