Auto merge of #12383 - zeusintuivo:feature/11611, r=nox

Rename SharedKeyboardAndMouseEventInit to EventModifierInit

<!-- Please describe your changes on the following line: -->
- [X] renamed file SharedMouseAndKeyboardEventInit,
- [X] changed SharedKeyboardAndMouseEventInit to EventModifierInit.
- [X] Rebased mozilla/master into it.
- [x] Ran build and tidy test without errors

---
<!-- 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 fix #11611 (github issue number if applicable).

<!-- 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/12383)
<!-- Reviewable:end -->

4 files changed, 5 insertions, 5 deletions

diff --git a/components/script/dom/webidls/SharedMouseAndKeyboardEventInit.webidl b/components/script/dom/webidls/EventModifierInit.webidl
index 906be401f78..f61ba1b8219 100644
--- a/components/script/dom/webidls/SharedMouseAndKeyboardEventInit.webidl
+++ b/components/script/dom/webidls/EventModifierInit.webidl
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // https://w3c.github.io/uievents/#dictdef-eventmodifierinit
-dictionary SharedKeyboardAndMouseEventInit : UIEventInit {
+dictionary EventModifierInit : UIEventInit {
     boolean ctrlKey = false;
     boolean shiftKey = false;
     boolean altKey = false;
diff --git a/components/script/dom/webidls/KeyboardEvent.webidl b/components/script/dom/webidls/KeyboardEvent.webidl
index 5a9865c8a6d..9426b0da30a 100644
--- a/components/script/dom/webidls/KeyboardEvent.webidl
+++ b/components/script/dom/webidls/KeyboardEvent.webidl
@@ -43,7 +43,7 @@ partial interface KeyboardEvent {
 };
 
 // https://w3c.github.io/uievents/#dictdef-keyboardeventinit
-dictionary KeyboardEventInit : SharedKeyboardAndMouseEventInit {
+dictionary KeyboardEventInit : EventModifierInit {
     DOMString     key = "";
     DOMString     code = "";
     unsigned long location = 0;
diff --git a/components/script/dom/webidls/MouseEvent.webidl b/components/script/dom/webidls/MouseEvent.webidl
index e309ce0924c..c95739429a8 100644
--- a/components/script/dom/webidls/MouseEvent.webidl
+++ b/components/script/dom/webidls/MouseEvent.webidl
@@ -24,7 +24,7 @@ interface MouseEvent : UIEvent {
 };
 
 // https://w3c.github.io/uievents/#dictdef-eventmodifierinit
-dictionary MouseEventInit : SharedKeyboardAndMouseEventInit {
+dictionary MouseEventInit : EventModifierInit {
     long           screenX = 0;
     long           screenY = 0;
     long           clientX = 0;
diff --git a/tests/wpt/web-platform-tests/html/dom/interfaces.html b/tests/wpt/web-platform-tests/html/dom/interfaces.html
index c8bb27b3751..9713b38fdcc 100644
--- a/tests/wpt/web-platform-tests/html/dom/interfaces.html
+++ b/tests/wpt/web-platform-tests/html/dom/interfaces.html
@@ -499,7 +499,7 @@ interface MouseEvent : UIEvent {
     boolean getModifierState (DOMString keyArg);
 };
 
-dictionary MouseEventInit : SharedKeyboardAndMouseEventInit {
+dictionary MouseEventInit : EventModifierInit {
     long           screenX = 0;
     long           screenY = 0;
     long           clientX = 0;
@@ -509,7 +509,7 @@ dictionary MouseEventInit : SharedKeyboardAndMouseEventInit {
     EventTarget?   relatedTarget = null;
 };
 
-dictionary SharedKeyboardAndMouseEventInit : UIEventInit {
+dictionary EventModifierInit : UIEventInit {
     boolean ctrlKey = false;
     boolean shiftKey = false;
     boolean altKey = false;