From 598d343854f9effdfd1316a1ec42705e961ac744 Mon Sep 17 00:00:00 2001
From: sreeise <reeisesean@gmail.com>
Date: Thu, 25 Jul 2019 13:32:27 -0400
Subject: Changed DOMString usages to string in MediaFragmentParser

---
 components/script/dom/mediafragmentparser.rs | 37 +++++++++-------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

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

diff --git a/components/script/dom/mediafragmentparser.rs b/components/script/dom/mediafragmentparser.rs
index ddd3f029df4..2e9de4b0f8c 100644
--- a/components/script/dom/mediafragmentparser.rs
+++ b/components/script/dom/mediafragmentparser.rs
@@ -2,7 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use crate::dom::bindings::str::DOMString;
 use chrono::NaiveDateTime;
 use servo_url::ServoUrl;
 use std::borrow::Cow;
@@ -39,19 +38,19 @@ pub struct SpatialClipping {
 
 #[derive(Clone, Debug, Default, PartialEq)]
 pub struct MediaFragmentParser {
-    id: Option<DOMString>,
-    tracks: Vec<DOMString>,
+    id: Option<String>,
+    tracks: Vec<String>,
     spatial: Option<SpatialClipping>,
     start: Option<f64>,
     end: Option<f64>,
 }
 
 impl MediaFragmentParser {
-    pub fn id(&self) -> Option<DOMString> {
+    pub fn id(&self) -> Option<String> {
         self.id.clone()
     }
 
-    pub fn tracks(&self) -> &Vec<DOMString> {
+    pub fn tracks(&self) -> &Vec<String> {
         self.tracks.as_ref()
     }
 
@@ -80,8 +79,8 @@ impl MediaFragmentParser {
                             parser.spatial = Some(spatial);
                         }
                     },
-                    b"id" => parser.id = Some(DOMString::from(value.as_ref())),
-                    b"track" => parser.tracks.push(DOMString::from(value.as_ref())),
+                    b"id" => parser.id = Some(value.to_string()),
+                    b"track" => parser.tracks.push(value.to_string()),
                     _ => {},
                 }
             }
@@ -219,39 +218,25 @@ fn decode_octets(bytes: &[u8]) -> Vec<(Cow<str>, Cow<str>)> {
 }
 
 // Parse a full URL or a relative URL without a base retaining the query and/or fragment.
-fn split_url(s: &str) -> (DOMString, DOMString) {
+fn split_url(s: &str) -> (&str, &str) {
     if s.contains('?') || s.contains('#') {
-        let mut query = DOMString::new();
-        let mut fragment = DOMString::new();
-
         for (index, byte) in s.bytes().enumerate() {
             if byte == b'?' {
-                let mut found = false;
                 let partial = &s[index + 1..];
                 for (i, byte) in partial.bytes().enumerate() {
                     if byte == b'#' {
-                        found = true;
-                        query.push_str(&partial[..i]);
-                        fragment.push_str(&partial[i + 1..]);
+                        return (&partial[..i], &partial[i + 1..]);
                     }
                 }
-                if found {
-                    break;
-                } else {
-                    query.push_str(partial);
-                    break;
-                }
+                return (partial, "");
             }
 
             if byte == b'#' {
-                fragment.push_str(&s[index + 1..]);
-                break;
+                return ("", &s[index + 1..]);
             }
         }
-        (query, fragment)
-    } else {
-        (DOMString::new(), DOMString::from(s))
     }
+    ("", s)
 }
 
 fn is_byte_number(byte: u8) -> bool {
-- 
cgit v1.2.3