Script: Change script/dom/{bluetooth,canvas,html} to not rely on Deref<str> for DOMString (servo#39480)

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

We use str() method or direct implementations on DOMString for these
methods. We also change some types.

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/dom/bluetooth/bluetooth.rs

@@ -432,7 +432,7 @@ fn canonicalize_filter(filter: &BluetoothLEScanFilterInit) -> Fallible<Bluetooth
             let mut map = HashMap::new();
             for (key, bdfi) in manufacturer_data_map.iter() {
                 // Step 7.1 - 7.2.
-                let manufacturer_id = match u16::from_str(key.as_ref()) {
+                let manufacturer_id = match u16::from_str(key.str()) {
                     Ok(id) => id,
                     Err(err) => {
                         return Err(Type(format!("{} {} {}", KEY_CONVERSION_ERROR, key, err)));
@@ -461,7 +461,7 @@ fn canonicalize_filter(filter: &BluetoothLEScanFilterInit) -> Fallible<Bluetooth
             }
             let mut map = HashMap::new();
             for (key, bdfi) in service_data_map.iter() {
-                let service_name = match u32::from_str(key.as_ref()) {
+                let service_name = match u32::from_str(key.str()) {
                     // Step 9.1.
                     Ok(number) => StringOrUnsignedLong::UnsignedLong(number),
                     // Step 9.2.
@@ -687,7 +687,7 @@ impl PermissionAlgorithm for Bluetooth {
                     continue;
                 }
             }
-            let device_id = String::from(allowed_device.deviceId.as_ref());
+            let device_id = String::from(allowed_device.deviceId.str());
 
             // Step 6.2.
             if let Some(ref filters) = descriptor.filters {

components/script/dom/bluetooth/bluetoothremotegattcharacteristic.rs

@@ -153,7 +153,7 @@ impl BluetoothRemoteGATTCharacteristicMethods<crate::DomTypeHolder>
         let p = Promise::new_in_current_realm(comp, can_gc);
 
         // Step 1.
-        if uuid_is_blocklisted(self.uuid.as_ref(), Blocklist::Reads) {
+        if uuid_is_blocklisted(self.uuid.str(), Blocklist::Reads) {
             p.reject_error(Security, can_gc);
             return p;
         }
@@ -191,7 +191,7 @@ impl BluetoothRemoteGATTCharacteristicMethods<crate::DomTypeHolder>
         let p = Promise::new_in_current_realm(comp, can_gc);
 
         // Step 1.
-        if uuid_is_blocklisted(self.uuid.as_ref(), Blocklist::Writes) {
+        if uuid_is_blocklisted(self.uuid.str(), Blocklist::Writes) {
             p.reject_error(Security, can_gc);
             return p;
         }
@@ -242,7 +242,7 @@ impl BluetoothRemoteGATTCharacteristicMethods<crate::DomTypeHolder>
         let p = Promise::new_in_current_realm(comp, can_gc);
 
         // Step 1.
-        if uuid_is_blocklisted(self.uuid.as_ref(), Blocklist::Reads) {
+        if uuid_is_blocklisted(self.uuid.str(), Blocklist::Reads) {
             p.reject_error(Security, can_gc);
             return p;
         }

components/script/dom/bluetooth/bluetoothremotegattdescriptor.rs

@@ -101,7 +101,7 @@ impl BluetoothRemoteGATTDescriptorMethods<crate::DomTypeHolder> for BluetoothRem
         let p = Promise::new_in_current_realm(comp, can_gc);
 
         // Step 1.
-        if uuid_is_blocklisted(self.uuid.as_ref(), Blocklist::Reads) {
+        if uuid_is_blocklisted(self.uuid.str(), Blocklist::Reads) {
             p.reject_error(Security, can_gc);
             return p;
         }
@@ -138,7 +138,7 @@ impl BluetoothRemoteGATTDescriptorMethods<crate::DomTypeHolder> for BluetoothRem
         let p = Promise::new_in_current_realm(comp, can_gc);
 
         // Step 1.
-        if uuid_is_blocklisted(self.uuid.as_ref(), Blocklist::Writes) {
+        if uuid_is_blocklisted(self.uuid.str(), Blocklist::Writes) {
             p.reject_error(Security, can_gc);
             return p;
         }

components/script/dom/bluetooth/bluetoothuuid.rs

@@ -638,7 +638,7 @@ fn resolve_uuid_name(
         StringOrUnsignedLong::String(dstring) => {
             // Step 2.
             let regex = Regex::new(VALID_UUID_REGEX).unwrap();
-            if regex.is_match(&dstring) {
+            if regex.is_match(dstring.str()) {
                 Ok(dstring)
             } else {
                 // Step 3.

components/script/dom/canvas/2d/canvas_state.rs

@@ -1298,7 +1298,7 @@ impl CanvasState {
             repetition.push_str("repeat");
         }
 
-        if let Ok(rep) = RepetitionStyle::from_str(&repetition) {
+        if let Ok(rep) = RepetitionStyle::from_str(repetition.str()) {
             let size = snapshot.size();
             Ok(Some(CanvasPattern::new(
                 global,
@@ -1357,7 +1357,7 @@ impl CanvasState {
 
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalcompositeoperation
     pub(super) fn set_global_composite_operation(&self, op_str: DOMString) {
-        if let Ok(op) = CompositionOrBlending::from_str(&op_str) {
+        if let Ok(op) = CompositionOrBlending::from_str(op_str.str()) {
             self.state.borrow_mut().global_composition = op;
         }
     }
@@ -2506,9 +2506,9 @@ impl UnshapedTextRun<'_> {
 
 pub(super) fn parse_color(
     canvas: Option<&HTMLCanvasElement>,
-    string: &str,
+    string: &DOMString,
 ) -> Result<AbsoluteColor, ()> {
-    let mut input = ParserInput::new(string);
+    let mut input = ParserInput::new(string.str());
     let mut parser = Parser::new(&mut input);
     let url = Url::parse("about:blank").unwrap().into();
     let context = ParserContext::new(

components/script/dom/canvas/offscreencanvas.rs

@@ -297,7 +297,7 @@ impl OffscreenCanvasMethods<crate::DomTypeHolder> for OffscreenCanvas {
             return Err(Error::InvalidState);
         }
 
-        match &*id {
+        match id.str() {
             "2d" => Ok(self
                 .get_or_init_2d_context(can_gc)
                 .map(RootedOffscreenRenderingContext::OffscreenCanvasRenderingContext2D)),

components/script/dom/html/htmlareaelement.rs

@@ -304,7 +304,7 @@ impl HTMLAreaElement {
     pub(crate) fn get_shape_from_coords(&self) -> Option<Area> {
         let elem = self.upcast::<Element>();
         let shape = elem.get_string_attribute(&"shape".into());
-        let shp: Shape = match_ignore_ascii_case! { &shape,
+        let shp: Shape = match_ignore_ascii_case! { shape.str(),
            "circle" => Shape::Circle,
            "circ" => Shape::Circle,
            "rectangle" => Shape::Rectangle,
@@ -315,7 +315,7 @@ impl HTMLAreaElement {
         };
         if elem.has_attribute(&"coords".into()) {
             let attribute = elem.get_string_attribute(&"coords".into());
-            Area::parse(&attribute, shp)
+            Area::parse(attribute.str(), shp)
         } else {
             None
         }

components/script/dom/html/htmlcanvaselement.rs

@@ -449,7 +449,7 @@ impl HTMLCanvasElementMethods<crate::DomTypeHolder> for HTMLCanvasElement {
             return Err(Error::InvalidState);
         }
 
-        Ok(match &*id {
+        Ok(match id.str() {
             "2d" => self
                 .get_or_init_2d_context(can_gc)
                 .map(RootedRenderingContext::CanvasRenderingContext2D),

components/script/dom/html/htmlcollection.rs

@@ -270,7 +270,9 @@ impl HTMLCollection {
         classes: DOMString,
         can_gc: CanGc,
     ) -> DomRoot<HTMLCollection> {
-        let class_atoms = split_html_space_chars(&classes).map(Atom::from).collect();
+        let class_atoms = split_html_space_chars(classes.str())
+            .map(Atom::from)
+            .collect();
         HTMLCollection::by_atomic_class_name(window, root, class_atoms, can_gc)
     }
 

components/script/dom/html/htmlelement.rs

@@ -932,7 +932,7 @@ impl HTMLElement {
     // returns Some if can infer direction by itself or from child nodes
     // returns None if requires to go up to parent
     pub(crate) fn directionality(&self) -> Option<String> {
-        let element_direction: &str = &self.Dir();
+        let element_direction = &self.Dir();
 
         if element_direction == "ltr" {
             return Some("ltr".to_owned());