diff options
Diffstat (limited to 'components/script/script_task.rs')
| -rw-r--r-- | components/script/script_task.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 1ab86d67570..7eb15d1e938 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -22,7 +22,6 @@ use devtools; use document_loader::{LoadType, DocumentLoader, NotifierData}; use dom::bindings::cell::DOMRefCell; -use dom::bindings::codegen::Bindings::AttrBinding::AttrMethods; use dom::bindings::codegen::Bindings::DocumentBinding::{DocumentMethods, DocumentReadyState}; use dom::bindings::codegen::InheritTypes::{ElementCast, EventTargetCast, NodeCast, EventCast}; use dom::bindings::conversions::FromJSValConvertible; @@ -319,7 +318,7 @@ pub struct MainThreadScriptChan(pub Sender<MainThreadScriptMsg>); impl ScriptChan for MainThreadScriptChan { fn send(&self, msg: CommonScriptMsg) -> Result<(), ()> { let MainThreadScriptChan(ref chan) = *self; - return chan.send(MainThreadScriptMsg::Common(msg)).map_err(|_| ()); + chan.send(MainThreadScriptMsg::Common(msg)).map_err(|_| ()) } fn clone(&self) -> Box<ScriptChan + Send> { @@ -1722,7 +1721,7 @@ impl ScriptTask { // layer the element belongs to, and have it send the scroll message to the // compositor. self.compositor.borrow_mut().send(ScriptToCompositorMsg::ScrollFragmentPoint( - pipeline_id, LayerId::null(), point)).unwrap(); + pipeline_id, LayerId::null(), point, false)).unwrap(); } /// Reflows non-incrementally, rebuilding the entire layout tree in the process. @@ -1798,7 +1797,7 @@ impl ScriptTask { let element = ElementCast::to_ref(target.r()).unwrap(); let status = element.get_attribute(&ns!(""), &atom!("href")) .and_then(|href| { - let value = href.r().Value(); + let value = href.value(); let url = document.r().url(); UrlParser::new().base_url(&url).parse(&value).map(|url| url.serialize()).ok() }); |