Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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 -->
This commit is contained in:
bors-servo 2016-07-11 08:25:45 -07:00 • committed by GitHub
commit 9e010a8aec
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/webidls/SharedMouseAndKeyboardEventInit.webidl → components/script/dom/webidls/EventModifierInit.webidl
View file

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// https://w3c.github.io/uievents/#dictdef-eventmodifierinit // https://w3c.github.io/uievents/#dictdef-eventmodifierinit
dictionary SharedKeyboardAndMouseEventInit : UIEventInit { dictionary EventModifierInit : UIEventInit {
boolean ctrlKey = false; boolean ctrlKey = false;
boolean shiftKey = false; boolean shiftKey = false;
boolean altKey = false; boolean altKey = false;

2
components/script/dom/webidls/KeyboardEvent.webidl
View file

@ -43,7 +43,7 @@ partial interface KeyboardEvent {
}; };
// https://w3c.github.io/uievents/#dictdef-keyboardeventinit // https://w3c.github.io/uievents/#dictdef-keyboardeventinit
dictionary KeyboardEventInit : SharedKeyboardAndMouseEventInit { dictionary KeyboardEventInit : EventModifierInit {
DOMString key = ""; DOMString key = "";
DOMString code = ""; DOMString code = "";
unsigned long location = 0; unsigned long location = 0;

2
components/script/dom/webidls/MouseEvent.webidl
View file

@ -24,7 +24,7 @@ interface MouseEvent : UIEvent {
}; };
// https://w3c.github.io/uievents/#dictdef-eventmodifierinit // https://w3c.github.io/uievents/#dictdef-eventmodifierinit
dictionary MouseEventInit : SharedKeyboardAndMouseEventInit { dictionary MouseEventInit : EventModifierInit {
long screenX = 0; long screenX = 0;
long screenY = 0; long screenY = 0;
long clientX = 0; long clientX = 0;

4
tests/wpt/web-platform-tests/html/dom/interfaces.html
View file

@ -499,7 +499,7 @@ interface MouseEvent : UIEvent {
boolean getModifierState (DOMString keyArg); boolean getModifierState (DOMString keyArg);
}; };
dictionary MouseEventInit : SharedKeyboardAndMouseEventInit { dictionary MouseEventInit : EventModifierInit {
long screenX = 0; long screenX = 0;
long screenY = 0; long screenY = 0;
long clientX = 0; long clientX = 0;
@ -509,7 +509,7 @@ dictionary MouseEventInit : SharedKeyboardAndMouseEventInit {
EventTarget? relatedTarget = null; EventTarget? relatedTarget = null;
}; };
dictionary SharedKeyboardAndMouseEventInit : UIEventInit { dictionary EventModifierInit : UIEventInit {
boolean ctrlKey = false; boolean ctrlKey = false;
boolean shiftKey = false; boolean shiftKey = false;
boolean altKey = false; boolean altKey = false;