aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/activation.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-09-18 22:57:59 -0500
committerGitHub <noreply@github.com>2016-09-18 22:57:59 -0500
commit5457b80233f9ce6773711c7189230d9a0a63d93a (patch)
tree035cee7e21bb31b434d6353241960c12b465e366 /components/script/dom/activation.rs
parent157e3cc4e95e89e8c73a601028c09edaefe0f074 (diff)
parent5f961f9fd9aeb13ff6c5746a8d143a30a90b06c2 (diff)
downloadservo-5457b80233f9ce6773711c7189230d9a0a63d93a.tar.gz
servo-5457b80233f9ce6773711c7189230d9a0a63d93a.zip
Auto merge of #13307 - bubbles231:code_refactor, r=Manishearth
Code refactoring <!-- Please describe your changes on the following line: --> The code was refactored to follow Rust naming conventions better. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes help fix #12379. <!-- Either: --> - [ ] There are tests for these changes OR - [X] These changes do not require tests because logic was not changed. <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13307) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/activation.rs')
-rw-r--r--components/script/dom/activation.rs18
1 files changed, 9 insertions, 9 deletions
diff --git a/components/script/dom/activation.rs b/components/script/dom/activation.rs
index 5c59393f766..58db9234170 100644
--- a/components/script/dom/activation.rs
+++ b/components/script/dom/activation.rs
@@ -31,7 +31,7 @@ pub trait Activatable {
fn activation_behavior(&self, event: &Event, target: &EventTarget);
// 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, shift_key: bool, alt_key: bool, meta_key: bool);
// https://html.spec.whatwg.org/multipage/#concept-selector-active
fn enter_formal_activation_state(&self) {
@@ -62,10 +62,10 @@ pub enum ActivationSource {
// https://html.spec.whatwg.org/multipage/#run-synthetic-click-activation-steps
pub fn synthetic_click_activation(element: &Element,
- ctrlKey: bool,
- shiftKey: bool,
- altKey: bool,
- metaKey: bool,
+ ctrl_key: bool,
+ shift_key: bool,
+ alt_key: bool,
+ meta_key: bool,
source: ActivationSource) {
// Step 1
if element.click_in_progress() {
@@ -93,10 +93,10 @@ pub fn synthetic_click_activation(element: &Element,
0,
0,
0,
- ctrlKey,
- shiftKey,
- altKey,
- metaKey,
+ ctrl_key,
+ shift_key,
+ alt_key,
+ meta_key,
0,
None);
let event = mouse.upcast::<Event>();