aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/script/dom/dedicatedworkerglobalscope.rs23
-rw-r--r--components/script/dom/filereader.rs18
-rw-r--r--components/script/dom/htmlformelement.rs26
-rw-r--r--components/script/dom/htmlmediaelement.rs1
-rw-r--r--components/script/dom/serviceworkerglobalscope.rs18
5 files changed, 41 insertions, 45 deletions
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs
index 6baa4673572..7e1c9e1abc3 100644
--- a/components/script/dom/dedicatedworkerglobalscope.rs
+++ b/components/script/dom/dedicatedworkerglobalscope.rs
@@ -104,9 +104,9 @@ pub enum DedicatedWorkerScriptMsg {
}
pub enum MixedMessage {
- FromWorker(DedicatedWorkerScriptMsg),
- FromDevtools(DevtoolScriptControlMsg),
- FromControl(DedicatedWorkerControlMsg),
+ Worker(DedicatedWorkerScriptMsg),
+ Devtools(DevtoolScriptControlMsg),
+ Control(DedicatedWorkerControlMsg),
}
impl QueuedTaskConversion for DedicatedWorkerScriptMsg {
@@ -220,15 +220,15 @@ impl WorkerEventLoopMethods for DedicatedWorkerGlobalScope {
}
fn from_control_msg(&self, msg: DedicatedWorkerControlMsg) -> MixedMessage {
- MixedMessage::FromControl(msg)
+ MixedMessage::Control(msg)
}
fn from_worker_msg(&self, msg: DedicatedWorkerScriptMsg) -> MixedMessage {
- MixedMessage::FromWorker(msg)
+ MixedMessage::Worker(msg)
}
fn from_devtools_msg(&self, msg: DevtoolScriptControlMsg) -> MixedMessage {
- MixedMessage::FromDevtools(msg)
+ MixedMessage::Devtools(msg)
}
fn control_receiver(&self) -> &Receiver<DedicatedWorkerControlMsg> {
@@ -539,7 +539,7 @@ impl DedicatedWorkerGlobalScope {
fn handle_mixed_message(&self, msg: MixedMessage) -> bool {
// FIXME(#26324): `self.worker` is None in devtools messages.
match msg {
- MixedMessage::FromDevtools(msg) => match msg {
+ MixedMessage::Devtools(msg) => match msg {
DevtoolScriptControlMsg::EvaluateJS(_pipe_id, string, sender) => {
devtools::handle_evaluate_js(self.upcast(), string, sender)
},
@@ -548,15 +548,12 @@ impl DedicatedWorkerGlobalScope {
},
_ => debug!("got an unusable devtools control message inside the worker!"),
},
- MixedMessage::FromWorker(DedicatedWorkerScriptMsg::CommonWorker(
- linked_worker,
- msg,
- )) => {
+ MixedMessage::Worker(DedicatedWorkerScriptMsg::CommonWorker(linked_worker, msg)) => {
let _ar = AutoWorkerReset::new(self, linked_worker);
self.handle_script_event(msg);
},
- MixedMessage::FromWorker(DedicatedWorkerScriptMsg::WakeUp) => {},
- MixedMessage::FromControl(DedicatedWorkerControlMsg::Exit) => {
+ MixedMessage::Worker(DedicatedWorkerScriptMsg::WakeUp) => {},
+ MixedMessage::Control(DedicatedWorkerControlMsg::Exit) => {
return false;
},
}
diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs
index 713498c9d3a..3d6c847cdc6 100644
--- a/components/script/dom/filereader.rs
+++ b/components/script/dom/filereader.rs
@@ -41,9 +41,9 @@ use crate::task_source::{TaskSource, TaskSourceName};
#[derive(Clone, Copy, JSTraceable, MallocSizeOf, PartialEq)]
pub enum FileReaderFunction {
- ReadAsText,
- ReadAsDataUrl,
- ReadAsArrayBuffer,
+ Text,
+ DataUrl,
+ ArrayBuffer,
}
pub type TrustedFileReader = Trusted<FileReader>;
@@ -253,13 +253,13 @@ impl FileReader {
// Step 8.2
match data.function {
- FileReaderFunction::ReadAsDataUrl => {
+ FileReaderFunction::DataUrl => {
FileReader::perform_readasdataurl(&fr.result, data, &blob_contents)
},
- FileReaderFunction::ReadAsText => {
+ FileReaderFunction::Text => {
FileReader::perform_readastext(&fr.result, data, &blob_contents)
},
- FileReaderFunction::ReadAsArrayBuffer => {
+ FileReaderFunction::ArrayBuffer => {
let _ac = enter_realm(&*fr);
FileReader::perform_readasarraybuffer(
&fr.result,
@@ -349,17 +349,17 @@ impl FileReaderMethods for FileReader {
// https://w3c.github.io/FileAPI/#dfn-readAsArrayBuffer
fn ReadAsArrayBuffer(&self, blob: &Blob) -> ErrorResult {
- self.read(FileReaderFunction::ReadAsArrayBuffer, blob, None)
+ self.read(FileReaderFunction::ArrayBuffer, blob, None)
}
// https://w3c.github.io/FileAPI/#dfn-readAsDataURL
fn ReadAsDataURL(&self, blob: &Blob) -> ErrorResult {
- self.read(FileReaderFunction::ReadAsDataUrl, blob, None)
+ self.read(FileReaderFunction::DataUrl, blob, None)
}
// https://w3c.github.io/FileAPI/#dfn-readAsText
fn ReadAsText(&self, blob: &Blob, label: Option<DOMString>) -> ErrorResult {
- self.read(FileReaderFunction::ReadAsText, blob, label)
+ self.read(FileReaderFunction::Text, blob, label)
}
// https://w3c.github.io/FileAPI/#dfn-abort
diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index 8d63f4b9d15..8ac0d17a7aa 100644
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -826,21 +826,19 @@ impl HTMLFormElement {
// Step 22
match (&*scheme, method) {
- (_, FormMethod::FormDialog) => {
+ (_, FormMethod::Dialog) => {
// TODO: Submit dialog
// https://html.spec.whatwg.org/multipage/#submit-dialog
},
// https://html.spec.whatwg.org/multipage/#submit-mutate-action
- ("http", FormMethod::FormGet) |
- ("https", FormMethod::FormGet) |
- ("data", FormMethod::FormGet) => {
+ ("http", FormMethod::Get) | ("https", FormMethod::Get) | ("data", FormMethod::Get) => {
load_data
.headers
.typed_insert(ContentType::from(mime::APPLICATION_WWW_FORM_URLENCODED));
self.mutate_action_url(&mut form_data, load_data, encoding, target_window);
},
// https://html.spec.whatwg.org/multipage/#submit-body
- ("http", FormMethod::FormPost) | ("https", FormMethod::FormPost) => {
+ ("http", FormMethod::Post) | ("https", FormMethod::Post) => {
load_data.method = Method::POST;
self.submit_entity_body(
&mut form_data,
@@ -853,16 +851,16 @@ impl HTMLFormElement {
// https://html.spec.whatwg.org/multipage/#submit-get-action
("file", _) |
("about", _) |
- ("data", FormMethod::FormPost) |
+ ("data", FormMethod::Post) |
("ftp", _) |
("javascript", _) => {
self.plan_to_navigate(load_data, target_window);
},
- ("mailto", FormMethod::FormPost) => {
+ ("mailto", FormMethod::Post) => {
// TODO: Mail as body
// https://html.spec.whatwg.org/multipage/#submit-mailto-body
},
- ("mailto", FormMethod::FormGet) => {
+ ("mailto", FormMethod::Get) => {
// TODO: Mail with headers
// https://html.spec.whatwg.org/multipage/#submit-mailto-headers
},
@@ -1361,9 +1359,9 @@ pub enum FormEncType {
#[derive(Clone, Copy, MallocSizeOf)]
pub enum FormMethod {
- FormGet,
- FormPost,
- FormDialog,
+ Get,
+ Post,
+ Dialog,
}
/// <https://html.spec.whatwg.org/multipage/#form-associated-element>
@@ -1431,9 +1429,9 @@ impl<'a> FormSubmitter<'a> {
),
};
match &*attr {
- "dialog" => FormMethod::FormDialog,
- "post" => FormMethod::FormPost,
- _ => FormMethod::FormGet,
+ "dialog" => FormMethod::Dialog,
+ "post" => FormMethod::Post,
+ _ => FormMethod::Get,
}
}
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index 6f6ed722a3e..6daf2693ca6 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -412,6 +412,7 @@ pub enum NetworkState {
/// <https://html.spec.whatwg.org/multipage/#dom-media-readystate>
#[derive(Clone, Copy, Debug, JSTraceable, MallocSizeOf, PartialEq, PartialOrd)]
#[repr(u8)]
+#[allow(clippy::enum_variant_names)] // Clippy warning silenced here because these names are from the specification.
pub enum ReadyState {
HaveNothing = HTMLMediaElementConstants::HAVE_NOTHING as u8,
HaveMetadata = HTMLMediaElementConstants::HAVE_METADATA as u8,
diff --git a/components/script/dom/serviceworkerglobalscope.rs b/components/script/dom/serviceworkerglobalscope.rs
index 07faf3da3c9..4f9c9b4776b 100644
--- a/components/script/dom/serviceworkerglobalscope.rs
+++ b/components/script/dom/serviceworkerglobalscope.rs
@@ -123,9 +123,9 @@ pub enum ServiceWorkerControlMsg {
}
pub enum MixedMessage {
- FromServiceWorker(ServiceWorkerScriptMsg),
- FromDevtools(DevtoolScriptControlMsg),
- FromControl(ServiceWorkerControlMsg),
+ ServiceWorker(ServiceWorkerScriptMsg),
+ Devtools(DevtoolScriptControlMsg),
+ Control(ServiceWorkerControlMsg),
}
#[derive(Clone, JSTraceable)]
@@ -202,15 +202,15 @@ impl WorkerEventLoopMethods for ServiceWorkerGlobalScope {
}
fn from_control_msg(&self, msg: ServiceWorkerControlMsg) -> MixedMessage {
- MixedMessage::FromControl(msg)
+ MixedMessage::Control(msg)
}
fn from_worker_msg(&self, msg: ServiceWorkerScriptMsg) -> MixedMessage {
- MixedMessage::FromServiceWorker(msg)
+ MixedMessage::ServiceWorker(msg)
}
fn from_devtools_msg(&self, msg: DevtoolScriptControlMsg) -> MixedMessage {
- MixedMessage::FromDevtools(msg)
+ MixedMessage::Devtools(msg)
}
fn control_receiver(&self) -> &Receiver<ServiceWorkerControlMsg> {
@@ -414,7 +414,7 @@ impl ServiceWorkerGlobalScope {
fn handle_mixed_message(&self, msg: MixedMessage) -> bool {
match msg {
- MixedMessage::FromDevtools(msg) => match msg {
+ MixedMessage::Devtools(msg) => match msg {
DevtoolScriptControlMsg::EvaluateJS(_pipe_id, string, sender) => {
devtools::handle_evaluate_js(self.upcast(), string, sender)
},
@@ -423,10 +423,10 @@ impl ServiceWorkerGlobalScope {
},
_ => debug!("got an unusable devtools control message inside the worker!"),
},
- MixedMessage::FromServiceWorker(msg) => {
+ MixedMessage::ServiceWorker(msg) => {
self.handle_script_event(msg);
},
- MixedMessage::FromControl(ServiceWorkerControlMsg::Exit) => {
+ MixedMessage::Control(ServiceWorkerControlMsg::Exit) => {
return false;
},
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-29 03:26:37 +0000