Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-08 16:43:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #21050 - jonathanKingston:fix-replacability-of-window-attrs, r=jdm

Browse source 
Allow supported window attributes to be replacable.

As seen in https://github.com/servo/servo/pull/21045 some Window attributes don't support JavaScript from being able to shadow and replace their values.

This PR adds all other attributes I could find that are supported by servo to be replaceable.

---
<!-- 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

<!-- Either: -->
- [X] There are tests for these changes

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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/21050)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-06-19 18:11:06 -04:00 • committed by GitHub
commit e231a68acf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/script/dom/webidls/Window.webidl
View file

@ -104,7 +104,7 @@ dictionary ScrollToOptions : ScrollOptions {
// http://dev.w3.org/csswg/cssom-view/#extensions-to-the-window-interface // http://dev.w3.org/csswg/cssom-view/#extensions-to-the-window-interface
partial interface Window { partial interface Window {
[Exposed=(Window), NewObject] MediaQueryList matchMedia(DOMString query); [Exposed=(Window), NewObject] MediaQueryList matchMedia(DOMString query);
[SameObject] readonly attribute Screen screen; [SameObject, Replaceable] readonly attribute Screen screen;
// browsing context // browsing context
void moveTo(long x, long y); void moveTo(long x, long y);
@ -113,14 +113,14 @@ partial interface Window {
void resizeBy(long x, long y); void resizeBy(long x, long y);
// viewport // viewport
readonly attribute long innerWidth; [Replaceable] readonly attribute long innerWidth;
readonly attribute long innerHeight; [Replaceable] readonly attribute long innerHeight;
// viewport scrolling // viewport scrolling
readonly attribute long scrollX; [Replaceable] readonly attribute long scrollX;
readonly attribute long pageXOffset; [Replaceable] readonly attribute long pageXOffset;
readonly attribute long scrollY; [Replaceable] readonly attribute long scrollY;
readonly attribute long pageYOffset; [Replaceable] readonly attribute long pageYOffset;
void scroll(optional ScrollToOptions options); void scroll(optional ScrollToOptions options);
void scroll(unrestricted double x, unrestricted double y); void scroll(unrestricted double x, unrestricted double y);
void scrollTo(optional ScrollToOptions options); void scrollTo(optional ScrollToOptions options);
@ -129,11 +129,11 @@ partial interface Window {
void scrollBy(unrestricted double x, unrestricted double y); void scrollBy(unrestricted double x, unrestricted double y);
// client // client
readonly attribute long screenX; [Replaceable] readonly attribute long screenX;
readonly attribute long screenY; [Replaceable] readonly attribute long screenY;
readonly attribute long outerWidth; [Replaceable] readonly attribute long outerWidth;
readonly attribute long outerHeight; [Replaceable] readonly attribute long outerHeight;
readonly attribute double devicePixelRatio; [Replaceable] readonly attribute double devicePixelRatio;
}; };
// Proprietary extensions. // Proprietary extensions.

4
tests/wpt/metadata/css/cssom-view/window-interface.xht.ini Normal file
View file

@ -0,0 +1,4 @@
[window-interface.xht]
[window_properties_readonly]
expected: FAIL

36
tests/wpt/metadata/html/browsers/the-window-object/window-properties.https.html.ini
View file

@ -53,39 +53,3 @@
[Window replaceable attribute: external] [Window replaceable attribute: external]
expected: FAIL expected: FAIL
[Window replaceable attribute: screen]
expected: FAIL
[Window replaceable attribute: scrollX]
expected: FAIL
[Window replaceable attribute: scrollY]
expected: FAIL
[Window replaceable attribute: pageXOffset]
expected: FAIL
[Window replaceable attribute: pageYOffset]
expected: FAIL
[Window replaceable attribute: innerWidth]
expected: FAIL
[Window replaceable attribute: innerHeight]
expected: FAIL
[Window replaceable attribute: screenX]
expected: FAIL
[Window replaceable attribute: screenY]
expected: FAIL
[Window replaceable attribute: outerWidth]
expected: FAIL
[Window replaceable attribute: outerHeight]
expected: FAIL
[Window replaceable attribute: devicePixelRatio]
expected: FAIL