From 1dad710063e601d3560b0cf89c602d16a0a48657 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Thu, 1 Jan 2015 12:20:52 +0100
Subject: Replace Root::deref() calls by Root::r() calls where possible.

This changes those calls that were already sound.
---
 components/script/dom/htmlscriptelement.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'components/script/dom/htmlscriptelement.rs')

diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index eb1dfbabbd7..19c1e1f7a0c 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -175,11 +175,11 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> {
 
         let (source, url) = match element.get_attribute(ns!(""), &atom!("src")).root() {
             Some(src) => {
-                if src.deref().Value().is_empty() {
+                if src.r().Value().is_empty() {
                     // TODO: queue a task to fire a simple event named `error` at the element
                     return;
                 }
-                match UrlParser::new().base_url(&base_url).parse(src.deref().Value().as_slice()) {
+                match UrlParser::new().base_url(&base_url).parse(src.r().Value().as_slice()) {
                     Ok(url) => {
                         // TODO: Do a potentially CORS-enabled fetch with the mode being the current
                         // state of the element's `crossorigin` content attribute, the origin being
@@ -192,14 +192,14 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> {
                                 (source, metadata.final_url)
                             }
                             Err(_) => {
-                                error!("error loading script {}", src.deref().Value());
+                                error!("error loading script {}", src.r().Value());
                                 return;
                             }
                         }
                     }
                     Err(_) => {
                         // TODO: queue a task to fire a simple event named `error` at the element
-                        error!("error parsing URL for script {}", src.deref().Value());
+                        error!("error parsing URL for script {}", src.r().Value());
                         return;
                     }
                 }
@@ -207,20 +207,20 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> {
             None => (text, base_url)
         };
 
-        window.evaluate_script_with_result(source.as_slice(), url.serialize().as_slice());
+        window.r().evaluate_script_with_result(source.as_slice(), url.serialize().as_slice());
 
-        let event = Event::new(GlobalRef::Window(*window),
+        let event = Event::new(GlobalRef::Window(window.r()),
                                "load".into_string(),
                                EventBubbles::DoesNotBubble,
                                EventCancelable::NotCancelable).root();
-        event.set_trusted(true);
+        event.r().set_trusted(true);
         let target: JSRef<EventTarget> = EventTargetCast::from_ref(self);
-        target.dispatch_event(*event);
+        target.dispatch_event(event.r());
     }
 
     fn is_javascript(self) -> bool {
         let element: JSRef<Element> = ElementCast::from_ref(self);
-        match element.get_attribute(ns!(""), &atom!("type")).root().map(|s| s.Value()) {
+        match element.get_attribute(ns!(""), &atom!("type")).root().map(|s| s.r().Value()) {
             Some(ref s) if s.is_empty() => {
                 // type attr exists, but empty means js
                 debug!("script type empty, inferring js");
@@ -234,7 +234,7 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> {
                 debug!("no script type");
                 match element.get_attribute(ns!(""), &atom!("language"))
                              .root()
-                             .map(|s| s.Value()) {
+                             .map(|s| s.r().Value()) {
                     Some(ref s) if s.is_empty() => {
                         debug!("script language empty, inferring js");
                         true
-- 
cgit v1.2.3


From d09d245ee1c0d6e095a29327555940f1256fc1e4 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Thu, 1 Jan 2015 18:36:37 +0100
Subject: Remove unsound Root::deref() calls in HTML elements.

---
 components/script/dom/htmlscriptelement.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'components/script/dom/htmlscriptelement.rs')

diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index 19c1e1f7a0c..fdcd8d474de 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -170,6 +170,7 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> {
         // TODO: Add support for the `defer` and `async` attributes.  (For now, we fetch all
         // scripts synchronously and execute them immediately.)
         let window = window_from_node(self).root();
+        let window = window.r();
         let page = window.page();
         let base_url = page.get_url();
 
@@ -207,9 +208,9 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> {
             None => (text, base_url)
         };
 
-        window.r().evaluate_script_with_result(source.as_slice(), url.serialize().as_slice());
+        window.evaluate_script_with_result(source.as_slice(), url.serialize().as_slice());
 
-        let event = Event::new(GlobalRef::Window(window.r()),
+        let event = Event::new(GlobalRef::Window(window),
                                "load".into_string(),
                                EventBubbles::DoesNotBubble,
                                EventCancelable::NotCancelable).root();
-- 
cgit v1.2.3