Skip to content

Commit

Permalink
Auto merge of #12383 - zeusintuivo:feature/11611, r=nox
Browse files Browse the repository at this point in the history
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 -->
  • Loading branch information
bors-servo committed Jul 11, 2016
2 parents 3ad7261 + d26bb29 commit 9e010a8
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion components/script/dom/webidls/KeyboardEvent.webidl
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion components/script/dom/webidls/MouseEvent.webidl
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions tests/wpt/web-platform-tests/html/dom/interfaces.html
Expand Up @@ -499,7 +499,7 @@ <h1>HTML IDL tests</h1>
boolean getModifierState (DOMString keyArg);
};

dictionary MouseEventInit : SharedKeyboardAndMouseEventInit {
dictionary MouseEventInit : EventModifierInit {
long screenX = 0;
long screenY = 0;
long clientX = 0;
Expand All @@ -509,7 +509,7 @@ <h1>HTML IDL tests</h1>
EventTarget? relatedTarget = null;
};

dictionary SharedKeyboardAndMouseEventInit : UIEventInit {
dictionary EventModifierInit : UIEventInit {
boolean ctrlKey = false;
boolean shiftKey = false;
boolean altKey = false;
Expand Down

0 comments on commit 9e010a8

Please sign in to comment.