Auto merge of #6706 - Ms2ger:ctor, r=jdm

Move the WebSocket constructor logic out of WebSocket::new.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6706)
<!-- Reviewable:end -->

1 files changed, 11 insertions, 15 deletions

diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index 2ffe520827d..1573720da57 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -77,7 +77,7 @@ fn establish_a_websocket_connection(url: (Host, String, bool), origin: String)
 
 
 impl WebSocket {
-    pub fn new_inherited(global: GlobalRef, url: Url) -> WebSocket {
+    fn new_inherited(global: GlobalRef, url: Url) -> WebSocket {
         WebSocket {
             eventtarget: EventTarget::new_inherited(EventTargetTypeId::WebSocket),
             url: url,
@@ -94,10 +94,15 @@ impl WebSocket {
 
     }
 
-    pub fn new(global: GlobalRef,
-               url: DOMString,
-               protocols: Option<DOMString>)
-               -> Fallible<Root<WebSocket>> {
+    fn new(global: GlobalRef, url: Url) -> Root<WebSocket> {
+        reflect_dom_object(box WebSocket::new_inherited(global, url),
+                           global, WebSocketBinding::Wrap)
+    }
+
+    pub fn Constructor(global: GlobalRef,
+                       url: DOMString,
+                       protocols: Option<DOMString>)
+                       -> Fallible<Root<WebSocket>> {
         // Step 1.
         let parsed_url = try!(Url::parse(&url).map_err(|_| Error::Syntax));
         let url = try!(parse_url(&parsed_url).map_err(|_| Error::Syntax));
@@ -128,9 +133,7 @@ impl WebSocket {
         // Step 6: Origin.
 
         // Step 7.
-        let ws = reflect_dom_object(box WebSocket::new_inherited(global, parsed_url),
-                                    global,
-                                    WebSocketBinding::Wrap);
+        let ws = WebSocket::new(global, parsed_url);
         let address = Trusted::new(global.get_cx(), ws.r(), global.script_chan());
 
         let origin = global.get_url().serialize();
@@ -162,13 +165,6 @@ impl WebSocket {
         // Step 7.
         Ok(ws)
     }
-
-    pub fn Constructor(global: GlobalRef,
-                       url: DOMString,
-                       protocols: Option<DOMString>)
-                       -> Fallible<Root<WebSocket>> {
-        WebSocket::new(global, url, protocols)
-    }
 }
 
 impl<'a> WebSocketMethods for &'a WebSocket {