diff --git a/components/script/dom/activation.rs b/components/script/dom/activation.rs index 5c59393f7664..221aa8657eb6 100644 --- a/components/script/dom/activation.rs +++ b/components/script/dom/activation.rs @@ -62,7 +62,7 @@ pub enum ActivationSource { // https://html.spec.whatwg.org/multipage/#run-synthetic-click-activation-steps pub fn synthetic_click_activation(element: &Element, - ctrlKey: bool, + ctrl_key: bool, shiftKey: bool, altKey: bool, metaKey: bool, @@ -93,7 +93,7 @@ pub fn synthetic_click_activation(element: &Element, 0, 0, 0, - ctrlKey, + ctrl_key, shiftKey, altKey, metaKey, diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs index e9df2b6c9996..2743258cc987 100644 --- a/components/script/dom/htmlanchorelement.rs +++ b/components/script/dom/htmlanchorelement.rs @@ -540,7 +540,7 @@ impl Activatable for HTMLAnchorElement { } //TODO:https://html.spec.whatwg.org/multipage/#the-a-element - fn implicit_submission(&self, _ctrlKey: bool, _shiftKey: bool, _altKey: bool, _metaKey: bool) { + fn implicit_submission(&self, _ctrl_key: bool, _shiftKey: bool, _altKey: bool, _metaKey: bool) { } } diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs index af95ec404b93..e5f86d585ab8 100644 --- a/components/script/dom/htmlbuttonelement.rs +++ b/components/script/dom/htmlbuttonelement.rs @@ -283,7 +283,7 @@ impl Activatable for HTMLButtonElement { // https://html.spec.whatwg.org/multipage/#implicit-submission #[allow(unsafe_code)] - fn implicit_submission(&self, ctrlKey: bool, shiftKey: bool, altKey: bool, metaKey: bool) { + fn implicit_submission(&self, ctrl_key: bool, shiftKey: bool, altKey: bool, metaKey: bool) { let doc = document_from_node(self); let node = doc.upcast::(); let owner = self.form_owner(); @@ -294,7 +294,7 @@ impl Activatable for HTMLButtonElement { .filter_map(Root::downcast::) .find(|r| r.form_owner() == owner) .map(|s| synthetic_click_activation(s.r().as_element(), - ctrlKey, + ctrl_key, shiftKey, altKey, metaKey, diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index 978d93f6138f..46fc0724b319 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -1275,7 +1275,7 @@ impl Activatable for HTMLInputElement { // https://html.spec.whatwg.org/multipage/#implicit-submission #[allow(unsafe_code)] - fn implicit_submission(&self, ctrlKey: bool, shiftKey: bool, altKey: bool, metaKey: bool) { + fn implicit_submission(&self, ctrl_key: bool, shiftKey: bool, altKey: bool, metaKey: bool) { let doc = document_from_node(self); let node = doc.upcast::(); let owner = self.form_owner(); @@ -1295,7 +1295,7 @@ impl Activatable for HTMLInputElement { Some(ref button) => { if button.is_instance_activatable() { synthetic_click_activation(button.as_element(), - ctrlKey, + ctrl_key, shiftKey, altKey, metaKey, diff --git a/components/script/dom/htmllabelelement.rs b/components/script/dom/htmllabelelement.rs index af3b51609a38..8accafc2da14 100644 --- a/components/script/dom/htmllabelelement.rs +++ b/components/script/dom/htmllabelelement.rs @@ -76,7 +76,7 @@ impl Activatable for HTMLLabelElement { } // https://html.spec.whatwg.org/multipage/#implicit-submission - fn implicit_submission(&self, _ctrlKey: bool, _shiftKey: bool, _altKey: bool, _metaKey: bool) { + fn implicit_submission(&self, _ctrl_key: bool, _shiftKey: bool, _altKey: bool, _metaKey: bool) { //FIXME: Investigate and implement implicit submission for label elements // Issue filed at https://github.com/servo/servo/issues/8263 } diff --git a/components/script/dom/touchevent.rs b/components/script/dom/touchevent.rs index 4f0822fddaf9..5623a8bf572f 100644 --- a/components/script/dom/touchevent.rs +++ b/components/script/dom/touchevent.rs @@ -62,7 +62,7 @@ impl TouchEvent { touches: &TouchList, changed_touches: &TouchList, target_touches: &TouchList, - ctrlKey: bool, + ctrl_key: bool, altKey: bool, shiftKey: bool, metaKey: bool) -> Root { @@ -71,7 +71,7 @@ impl TouchEvent { bool::from(canBubble), bool::from(cancelable), view, detail); - ev.ctrl_key.set(ctrlKey); + ev.ctrl_key.set(ctrl_key); ev.alt_key.set(altKey); ev.shift_key.set(shiftKey); ev.meta_key.set(metaKey);