Script: Change the rest of script to not rely on Deref<str> for DOMString (servo#39481)

This is part of the future work of implementing LazyDOMString as
outlined in issue servo#39479.

We use str() method or direct implementations on DOMString for these
methods. We also change some types.
This is independent of servo#39480

Signed-off-by: Narfinger [email protected]

Testing: This is essentially just renaming a method and a type and
should not change functionality.

Signed-off-by: Narfinger <[email protected]>

Author: Narfinger

components/script/body.rs

@@ -507,7 +507,7 @@ impl Extractable for Vec<u8> {
 impl Extractable for Blob {
     fn extract(&self, _global: &GlobalScope, can_gc: CanGc) -> Fallible<ExtractedBody> {
         let blob_type = self.Type();
-        let content_type = if blob_type.as_ref().is_empty() {
+        let content_type = if blob_type.is_empty() {
             None
         } else {
             Some(blob_type)

components/script/dom/bindings/domname.rs

@@ -91,7 +91,7 @@ pub(crate) fn is_valid_element_local_name(name: &str) -> bool {
 }
 
 /// <https://dom.spec.whatwg.org/#valid-doctype-name>
-pub(crate) fn is_valid_doctype_name(name: &str) -> bool {
+pub(crate) fn is_valid_doctype_name(name: &DOMString) -> bool {
     // A string is a valid doctype name if it does not contain
     // ASCII whitespace, U+0000 NULL, or U+003E (>).
     !name
@@ -121,7 +121,7 @@ pub(crate) enum Context {
 /// <https://dom.spec.whatwg.org/#validate-and-extract>
 pub(crate) fn validate_and_extract(
     namespace: Option<DOMString>,
-    qualified_name: &str,
+    qualified_name: &DOMString,
     context: Context,
 ) -> Fallible<(Namespace, Option<Prefix>, LocalName)> {
     // Step 1. If namespace is the empty string, then set it to null.
@@ -130,12 +130,12 @@ pub(crate) fn validate_and_extract(
     // Step 2. Let prefix be null.
     let mut prefix = None;
     // Step 3. Let localName be qualifiedName.
-    let mut local_name = qualified_name;
+    let mut local_name = qualified_name.str();
     // Step 4. If qualifiedName contains a U+003A (:):
     if let Some(idx) = qualified_name.find(':') {
         //     Step 4.1. Let splitResult be the result of running
         //          strictly split given qualifiedName and U+003A (:).
-        let p = &qualified_name[..idx];
+        let p = &qualified_name.str()[..idx];
 
         // Step 5. If prefix is not a valid namespace prefix,
         // then throw an "InvalidCharacterError" DOMException.
@@ -148,7 +148,7 @@ pub(crate) fn validate_and_extract(
         prefix = Some(p);
 
         //     Step 4.3. Set localName to splitResult[1].
-        let remaining = &qualified_name[(idx + 1).min(qualified_name.len())..];
+        let remaining = &qualified_name.str()[(idx + 1).min(qualified_name.len())..];
         match remaining.find(':') {
             Some(end) => local_name = &remaining[..end],
             None => local_name = remaining,

components/script/dom/blob.rs

@@ -176,7 +176,7 @@ impl BlobMethods<crate::DomTypeHolder> for Blob {
             },
         };
 
-        let type_string = normalize_type_string(blobPropertyBag.type_.as_ref());
+        let type_string = normalize_type_string(blobPropertyBag.type_.str());
         let blob_impl = BlobImpl::new_from_bytes(bytes, type_string);
 
         Ok(Blob::new_with_proto(global, proto, blob_impl, can_gc))
@@ -206,7 +206,7 @@ impl BlobMethods<crate::DomTypeHolder> for Blob {
         can_gc: CanGc,
     ) -> DomRoot<Blob> {
         let global = self.global();
-        let type_string = normalize_type_string(&content_type.unwrap_or_default());
+        let type_string = normalize_type_string(content_type.unwrap_or_default().str());
 
         // If our parent is already a sliced blob then we reference the data from the grandparent instead,
         // to keep the blob ancestry chain short.

components/script/dom/characterdata.rs

@@ -136,7 +136,7 @@ impl CharacterDataMethods<crate::DomTypeHolder> for CharacterData {
         let data = self.data.borrow();
         // Step 1.
         let mut substring = String::new();
-        let remaining = match split_at_utf16_code_unit_offset(&data, offset) {
+        let remaining = match split_at_utf16_code_unit_offset(data.str(), offset) {
             Ok((_, astral, s)) => {
                 // As if we had split the UTF-16 surrogate pair in half
                 // and then transcoded that to UTF-8 lossily,
@@ -169,7 +169,7 @@ impl CharacterDataMethods<crate::DomTypeHolder> for CharacterData {
     // https://dom.spec.whatwg.org/#dom-characterdata-appenddatadata
     fn AppendData(&self, data: DOMString) {
         // FIXME(ajeffrey): Efficient append on DOMStrings?
-        self.append_data(&data);
+        self.append_data(data.str());
     }
 
     // https://dom.spec.whatwg.org/#dom-characterdata-insertdataoffset-data
@@ -190,7 +190,7 @@ impl CharacterDataMethods<crate::DomTypeHolder> for CharacterData {
             let prefix;
             let replacement_before;
             let remaining;
-            match split_at_utf16_code_unit_offset(&data, offset) {
+            match split_at_utf16_code_unit_offset(data.str(), offset) {
                 Ok((p, astral, r)) => {
                     prefix = p;
                     // As if we had split the UTF-16 surrogate pair in half
@@ -231,7 +231,7 @@ impl CharacterDataMethods<crate::DomTypeHolder> for CharacterData {
             );
             new_data.push_str(prefix);
             new_data.push_str(replacement_before);
-            new_data.push_str(&arg);
+            new_data.push_str(arg.str());
             new_data.push_str(replacement_after);
             new_data.push_str(suffix);
         }
@@ -290,7 +290,7 @@ impl<'dom> LayoutCharacterDataHelpers<'dom> for LayoutDom<'dom, CharacterData> {
     #[allow(unsafe_code)]
     #[inline]
     fn data_for_layout(self) -> &'dom str {
-        unsafe { self.unsafe_get().data.borrow_for_layout() }
+        unsafe { self.unsafe_get().data.borrow_for_layout().str() }
     }
 }
 

components/script/dom/clipboarditem.rs

@@ -160,7 +160,7 @@ impl ClipboardItemMethods<crate::DomTypeHolder> for ClipboardItem {
 
             // Step 6.3 If key starts with `"web "` prefix, then
             // Step 6.3.1 Remove `"web "` prefix and assign the remaining string to key.
-            let (key, is_custom) = match key.strip_prefix(CUSTOM_FORMAT_PREFIX) {
+            let (key, is_custom) = match key.str().strip_prefix(CUSTOM_FORMAT_PREFIX) {
                 None => (key.str(), false),
                 // Step 6.3.2 Set isCustom true
                 Some(stripped) => (stripped, true),

components/script/dom/compositionevent.rs

@@ -77,7 +77,7 @@ impl CompositionEvent {
         ev
     }
 
-    pub(crate) fn data(&self) -> &str {
+    pub(crate) fn data(&self) -> &DOMString {
         &self.data
     }
 }

components/script/dom/console.rs

@@ -419,7 +419,7 @@ impl consoleMethods<crate::DomTypeHolder> for Console {
 
     // https://console.spec.whatwg.org/#timelog
     fn TimeLog(_cx: JSContext, global: &GlobalScope, label: DOMString, data: Vec<HandleValue>) {
-        if let Ok(delta) = global.time_log(&label) {
+        if let Ok(delta) = global.time_log(label.str()) {
             let message = format!("{label}: {delta}ms {}", stringify_handle_values(&data));
 
             Console::send_string_message(global, LogLevel::Log, message.clone());
@@ -428,7 +428,7 @@ impl consoleMethods<crate::DomTypeHolder> for Console {
 
     // https://console.spec.whatwg.org/#timeend
     fn TimeEnd(global: &GlobalScope, label: DOMString) {
-        if let Ok(delta) = global.time_end(&label) {
+        if let Ok(delta) = global.time_end(label.str()) {
             let message = format!("{label}: {delta}ms");
 
             Console::send_string_message(global, LogLevel::Log, message.clone());

components/script/dom/css.rs

@@ -31,16 +31,16 @@ impl CSSMethods<crate::DomTypeHolder> for CSS {
     /// <https://drafts.csswg.org/cssom/#the-css.escape()-method>
     fn Escape(_: &Window, ident: DOMString) -> Fallible<DOMString> {
         let mut escaped = String::new();
-        serialize_identifier(&ident, &mut escaped).unwrap();
+        serialize_identifier(ident.str(), &mut escaped).unwrap();
         Ok(DOMString::from(escaped))
     }
 
     /// <https://drafts.csswg.org/css-conditional/#dom-css-supports>
     fn Supports(win: &Window, property: DOMString, value: DOMString) -> bool {
         let mut decl = String::new();
-        serialize_identifier(&property, &mut decl).unwrap();
+        serialize_identifier(property.str(), &mut decl).unwrap();
         decl.push_str(": ");
-        decl.push_str(&value);
+        decl.push_str(value.str());
         let decl = Declaration(decl);
         let url_data = UrlExtraData(win.Document().url().get_arc());
         let context = ParserContext::new(
@@ -58,7 +58,7 @@ impl CSSMethods<crate::DomTypeHolder> for CSS {
 
     /// <https://drafts.csswg.org/css-conditional/#dom-css-supports>
     fn Supports_(win: &Window, condition: DOMString) -> bool {
-        let mut input = ParserInput::new(&condition);
+        let mut input = ParserInput::new(condition.str());
         let mut input = Parser::new(&mut input);
         let cond = match parse_condition_or_declaration(&mut input) {
             Ok(c) => c,

components/script/dom/csskeyframesrule.rs

@@ -76,8 +76,8 @@ impl CSSKeyframesRule {
     }
 
     /// Given a keyframe selector, finds the index of the first corresponding rule if any
-    fn find_rule(&self, selector: &str) -> Option<usize> {
-        let mut input = ParserInput::new(selector);
+    fn find_rule(&self, selector: &DOMString) -> Option<usize> {
+        let mut input = ParserInput::new(selector.str());
         let mut input = Parser::new(&mut input);
         if let Ok(sel) = KeyframeSelector::parse(&mut input) {
             let guard = self.cssrule.shared_lock().read();
@@ -117,7 +117,7 @@ impl CSSKeyframesRuleMethods<crate::DomTypeHolder> for CSSKeyframesRule {
     fn AppendRule(&self, rule: DOMString, can_gc: CanGc) {
         let style_stylesheet = self.cssrule.parent_stylesheet().style_stylesheet();
         let rule = Keyframe::parse(
-            &rule,
+            rule.str(),
             &style_stylesheet.contents,
             &style_stylesheet.shared_lock,
         );
@@ -161,7 +161,7 @@ impl CSSKeyframesRuleMethods<crate::DomTypeHolder> for CSSKeyframesRule {
         // Setting this property to a CSS-wide keyword or `none` does not throw,
         // it stores a value that serializes as a quoted string.
         self.cssrule.parent_stylesheet().will_modify();
-        let name = KeyframesName::from_ident(&value);
+        let name = KeyframesName::from_ident(value.str());
         let mut guard = self.cssrule.shared_lock().write();
         self.keyframesrule.borrow().write_with(&mut guard).name = name;
         self.cssrule.parent_stylesheet().notify_invalidations();

components/script/dom/cssrulelist.rs

@@ -9,6 +9,7 @@ use std::cell::RefCell;
 use dom_struct::dom_struct;
 use itertools::izip;
 use script_bindings::inheritance::Castable;
+use script_bindings::str::DOMString;
 use servo_arc::Arc;
 use style::shared_lock::{Locked, SharedRwLockReadGuard};
 use style::stylesheets::{
@@ -105,7 +106,7 @@ impl CSSRuleList {
     /// for keyframes-backed rules.
     pub(crate) fn insert_rule(
         &self,
-        rule: &str,
+        rule: &DOMString,
         idx: u32,
         containing_rule_types: CssRuleTypes,
         parse_relative_rule_type: Option<CssRuleType>,
@@ -138,7 +139,7 @@ impl CSSRuleList {
         let new_rule = css_rules
             .insert_rule(
                 &parent_stylesheet.shared_lock,
-                rule,
+                rule.str(),
                 &parent_stylesheet.contents,
                 index,
                 containing_rule_types,