Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve implementation of DOMRect and implement DOMRectReadOnly
Passes most tests from test-css.
- Loading branch information
1 parent
499a847
commit 4c1c05f
Showing
11 changed files
with
198 additions
and
184 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| /* This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| use dom::bindings::codegen::Bindings::DOMRectReadOnlyBinding::{DOMRectReadOnlyMethods, Wrap}; | ||
| use dom::bindings::error::Fallible; | ||
| use dom::bindings::global::GlobalRef; | ||
| use dom::bindings::js::Root; | ||
| use dom::bindings::utils::{Reflector, reflect_dom_object}; | ||
| use std::cell::Cell; | ||
|
|
||
| #[dom_struct] | ||
| pub struct DOMRectReadOnly { | ||
| reflector_: Reflector, | ||
| x: Cell<f64>, | ||
| y: Cell<f64>, | ||
| width: Cell<f64>, | ||
| height: Cell<f64>, | ||
| } | ||
|
|
||
| impl DOMRectReadOnly { | ||
| pub fn new_inherited(x: f64, y: f64, width: f64, height: f64) -> DOMRectReadOnly { | ||
| DOMRectReadOnly { | ||
| x: Cell::new(x), | ||
| y: Cell::new(y), | ||
| width: Cell::new(width), | ||
| height: Cell::new(height), | ||
| reflector_: Reflector::new(), | ||
| } | ||
| } | ||
|
|
||
| pub fn new(global: GlobalRef, x: f64, y: f64, width: f64, height: f64) -> Root<DOMRectReadOnly> { | ||
| reflect_dom_object(box DOMRectReadOnly::new_inherited(x, y, width, height), global, Wrap) | ||
| } | ||
|
|
||
| pub fn Constructor(global: GlobalRef, | ||
| x: f64, y: f64, width: f64, height: f64) -> Fallible<Root<DOMRectReadOnly>> { | ||
| Ok(DOMRectReadOnly::new(global, x, y, width, height)) | ||
| } | ||
|
|
||
| pub fn set_x(&self, value: f64) { | ||
| self.x.set(value); | ||
| } | ||
|
|
||
| pub fn set_y(&self, value: f64) { | ||
| self.y.set(value); | ||
| } | ||
|
|
||
| pub fn set_width(&self, value: f64) { | ||
| self.width.set(value); | ||
| } | ||
|
|
||
| pub fn set_height(&self, value: f64) { | ||
| self.height.set(value); | ||
| } | ||
| } | ||
|
|
||
| impl DOMRectReadOnlyMethods for DOMRectReadOnly { | ||
| // https://drafts.fxtf.org/geometry/#dom-domrectreadonly-x | ||
| fn X(&self) -> f64 { | ||
| self.x.get() | ||
| } | ||
|
|
||
| // https://drafts.fxtf.org/geometry/#dom-domrectreadonly-y | ||
| fn Y(&self) -> f64 { | ||
| self.y.get() | ||
| } | ||
|
|
||
| // https://drafts.fxtf.org/geometry/#dom-domrectreadonly-width | ||
| fn Width(&self) -> f64 { | ||
| self.width.get() | ||
| } | ||
|
|
||
| // https://drafts.fxtf.org/geometry/#dom-domrectreadonly-height | ||
| fn Height(&self) -> f64 { | ||
| self.height.get() | ||
| } | ||
|
|
||
| // https://drafts.fxtf.org/geometry/#dom-domrectreadonly-top | ||
| fn Top(&self) -> f64 { | ||
| let height = self.height.get(); | ||
| if height >= 0f64 { self.y.get() } else { self.y.get() + height } | ||
| } | ||
|
|
||
| // https://drafts.fxtf.org/geometry/#dom-domrectreadonly-right | ||
| fn Right(&self) -> f64 { | ||
| let width = self.width.get(); | ||
| if width < 0f64 { self.x.get() } else { self.x.get() + width } | ||
| } | ||
|
|
||
| // https://drafts.fxtf.org/geometry/#dom-domrectreadonly-bottom | ||
| fn Bottom(&self) -> f64 { | ||
| let height = self.height.get(); | ||
| if height < 0f64 { self.y.get() } else { self.y.get() + height } | ||
| } | ||
|
|
||
| // https://drafts.fxtf.org/geometry/#dom-domrectreadonly-left | ||
| fn Left(&self) -> f64 { | ||
| let width = self.width.get(); | ||
| if width >= 0f64 { self.x.get() } else { self.x.get() + width } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ | ||
| /* This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| [Constructor(optional unrestricted double x = 0, optional unrestricted double y = 0, | ||
| optional unrestricted double width = 0, optional unrestricted double height = 0), | ||
| /*Exposed=(Window,Worker)*/] | ||
| // https://drafts.fxtf.org/geometry/#domrect | ||
| interface DOMRectReadOnly { | ||
| // [NewObject] static DOMRectReadOnly fromRect(optional DOMRectInit other); | ||
|
|
||
| readonly attribute unrestricted double x; | ||
| readonly attribute unrestricted double y; | ||
| readonly attribute unrestricted double width; | ||
| readonly attribute unrestricted double height; | ||
| readonly attribute unrestricted double top; | ||
| readonly attribute unrestricted double right; | ||
| readonly attribute unrestricted double bottom; | ||
| readonly attribute unrestricted double left; | ||
| }; | ||
|
|
||
| // https://drafts.fxtf.org/geometry/#dictdef-domrectinit | ||
| dictionary DOMRectInit { | ||
| unrestricted double x = 0; | ||
| unrestricted double y = 0; | ||
| unrestricted double width = 0; | ||
| unrestricted double height = 0; | ||
| }; |
41 changes: 1 addition & 40 deletions
41
tests/wpt/metadata-css/geometry-1_dev/html/DOMRect-001.htm.ini
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,14 @@ | ||
| [DOMRect-001.htm] | ||
| type: testharness | ||
| [testConstructor0] | ||
| expected: FAIL | ||
|
|
||
| [testConstructor4] | ||
| expected: FAIL | ||
|
|
||
| [testConstructor5] | ||
| expected: FAIL | ||
|
|
||
| [testConstructorNegativeWidth] | ||
| expected: FAIL | ||
|
|
||
| [testConstructorNegativeHeight] | ||
| expected: FAIL | ||
|
|
||
| [testConstructorNegativeWidthHeight] | ||
| expected: FAIL | ||
|
|
||
| [testConstructorUndefined1] | ||
| expected: FAIL | ||
|
|
||
| [testConstructorUndefined2] | ||
| expected: FAIL | ||
|
|
||
| [testConstructorString1] | ||
| expected: FAIL | ||
|
|
||
| [testConstructorString2] | ||
| expected: FAIL | ||
|
|
||
| [testConstructorIllegal1] | ||
| expected: FAIL | ||
|
|
||
| [testConstructorIllegal2] | ||
| expected: FAIL | ||
|
|
||
| [testSetReadOnlyAttributes] | ||
| expected: FAIL | ||
|
|
||
| [testSetAttributes] | ||
| expected: FAIL | ||
|
|
||
| [testConstructor1] | ||
| expected: FAIL | ||
|
|
||
| [testConstructor2] | ||
| expected: FAIL | ||
|
|
||
| [testConstructor3] | ||
| [testReadOnlyConstructorUndefined1] | ||
| expected: FAIL | ||
|
|
Oops, something went wrong.