implement StyleSheet.disabled #14340

heycam · 2016-11-23T10:11:26Z

This implements the CSSOM StyleSheet.disabled IDL attribute.

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes fix #__ (github issue number if applicable).

There are tests for these changes OR
These changes do not require tests because _____

This change is

highfive · 2016-11-23T10:11:30Z

Heads up! This PR modifies the following files:

@bholley: components/style/stylesheets.rs, components/style/stylist.rs
@KiChjang: components/script/dom/htmllinkelement.rs, components/script/dom/htmlstyleelement.rs, components/script/dom/webidls/StyleSheet.webidl, components/script/dom/htmlmetaelement.rs, components/script/dom/cssstylesheet.rs, components/script/dom/stylesheet.rs
@fitzgen: components/script/dom/htmllinkelement.rs, components/script/dom/htmlstyleelement.rs, components/script/dom/webidls/StyleSheet.webidl, components/script/dom/htmlmetaelement.rs, components/script/dom/cssstylesheet.rs, components/script/dom/stylesheet.rs
@emilio: components/style/stylesheets.rs, components/style/stylist.rs

highfive · 2016-11-23T10:11:31Z

Warning

These commits modify style and script code, but no tests are modified. Please consider adding a test!

heycam · 2016-11-23T10:11:39Z

@bors-servo try

bors-servo · 2016-11-23T10:11:42Z

⌛ Trying commit f7676fc with merge 122e8a4...


        Auto merge of #14340 - heycam:sheet-disabled, r=<try>

implement StyleSheet.disabled  This implements the [CSSOM StyleSheet.disabled](https://drafts.csswg.org/cssom/#dom-stylesheet-disabled) IDL attribute. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable).  - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____

bors-servo · 2016-11-23T10:36:04Z

💔 Test failed - linux-dev

heycam · 2016-11-23T12:22:06Z

@bors-servo try

bors-servo · 2016-11-23T12:22:09Z

⌛ Trying commit c774129 with merge d7336c1...


        Auto merge of #14340 - heycam:sheet-disabled, r=<try>

implement StyleSheet.disabled  This implements the [CSSOM StyleSheet.disabled](https://drafts.csswg.org/cssom/#dom-stylesheet-disabled) IDL attribute. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable).  - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14340)

bors-servo · 2016-11-23T12:58:09Z

💔 Test failed - linux-dev

heycam · 2016-11-23T14:11:46Z

r? @SimonSapin

(I might still need to update some test expectations once the try run is done.)

heycam · 2016-11-23T14:13:11Z

One thing I'm not sure about is my use of AtomicBool on the Stylesheet. Should I be using some sort of cell?

bholley · 2016-11-23T18:59:54Z

AtomicFoo is basically the Sync version of Cell.

bors-servo · 2016-11-23T19:31:06Z

☔ The latest upstream changes (presumably #14241) made this pull request unmergeable. Please resolve the merge conflicts.

heycam · 2016-11-24T02:10:12Z

@bors-servo try

bors-servo · 2016-11-24T02:10:16Z

⌛ Trying commit 1618474 with merge 8d73042...


        Auto merge of #14340 - heycam:sheet-disabled, r=<try>

implement StyleSheet.disabled  This implements the [CSSOM StyleSheet.disabled](https://drafts.csswg.org/cssom/#dom-stylesheet-disabled) IDL attribute. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable).  - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14340)

heycam · 2016-11-24T02:11:25Z

@bors-servo try

bors-servo · 2016-11-24T11:00:36Z

💔 Test failed - linux-rel-wpt

jdm · 2016-11-24T14:13:27Z

@bors-servo: retry

#14317

bors-servo · 2016-11-24T14:13:30Z

⌛ Trying commit a97d126 with merge d769281...


        Auto merge of #14340 - heycam:sheet-disabled, r=<try>

implement StyleSheet.disabled  This implements the [CSSOM StyleSheet.disabled](https://drafts.csswg.org/cssom/#dom-stylesheet-disabled) IDL attribute. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable).  - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14340)

bors-servo · 2016-11-24T15:15:12Z

☀️ Test successful - arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-dev

Manishearth

r=me with the change

Manishearth · 2016-11-25T02:41:11Z

components/script/dom/cssstylesheet.rs

+    pub fn set_disabled(&self, disabled: bool) {
+        if self.style_stylesheet.set_disabled(disabled) {
+            let owner = self.owner.upcast::<Node>();
+            let doc = document_from_node(owner);


self.global().as_window().Document() works too, and doesn't need the node.


        Implement StyleSheet.disabled.

heycam · 2016-11-25T03:28:44Z

@bors-servo r=Manishearth

bors-servo · 2016-11-25T03:28:45Z

📌 Commit 64ff6dc has been approved by Manishearth

bors-servo · 2016-11-25T04:40:25Z

⌛ Testing commit 64ff6dc with merge c1c3974...


        Auto merge of #14340 - heycam:sheet-disabled, r=Manishearth

implement StyleSheet.disabled  This implements the [CSSOM StyleSheet.disabled](https://drafts.csswg.org/cssom/#dom-stylesheet-disabled) IDL attribute. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable).  - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14340)

bors-servo · 2016-11-25T05:21:49Z

💔 Test failed - mac-rel-wpt2

heycam · 2016-11-25T05:31:47Z

@bors-servo retry

#14338

bors-servo · 2016-11-25T06:21:19Z

⚡ Previous build results for arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, windows-dev are reusable. Rebuilding only mac-rel-wpt2...

bors-servo · 2016-11-25T06:33:06Z

⛄ The build was interrupted to prioritize another pull request.

bors-servo · 2016-11-25T07:10:51Z

⚡ Previous build results for arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, windows-dev are reusable. Rebuilding only mac-rel-wpt2...

bors-servo · 2016-11-25T07:15:18Z

⛄ The build was interrupted to prioritize another pull request.

bors-servo · 2016-11-25T09:29:43Z

⚡ Previous build results for arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, windows-dev are reusable. Rebuilding only mac-rel-wpt2...

bors-servo · 2016-11-25T10:39:49Z

☀️ Test successful - arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-dev

highfive assigned asajeffrey Nov 23, 2016

highfive added the S-awaiting-review label Nov 23, 2016

heycam assigned SimonSapin and unassigned asajeffrey Nov 23, 2016

highfive added the S-tests-failed label Nov 23, 2016

heycam force-pushed the heycam:sheet-disabled branch from f7676fc to c774129 Nov 23, 2016

highfive removed the S-tests-failed label Nov 23, 2016

highfive added the S-tests-failed label Nov 23, 2016

highfive added the S-needs-rebase label Nov 23, 2016

heycam force-pushed the heycam:sheet-disabled branch from c774129 to 1618474 Nov 24, 2016

highfive removed the S-tests-failed label Nov 24, 2016

heycam force-pushed the heycam:sheet-disabled branch from 1618474 to 9d1109a Nov 24, 2016

highfive added the S-tests-failed label Nov 24, 2016

Manishearth approved these changes Nov 25, 2016

View changes

Implement StyleSheet.disabled.

Loading status checks…

64ff6dc

heycam force-pushed the heycam:sheet-disabled branch from a97d126 to 64ff6dc Nov 25, 2016

highfive removed the S-tests-failed label Nov 25, 2016

highfive assigned Manishearth and unassigned SimonSapin Nov 25, 2016

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-rebase labels Nov 25, 2016

highfive added S-tests-failed and removed S-awaiting-merge labels Nov 25, 2016

bors-servo merged commit 64ff6dc into servo:master Nov 25, 2016
3 checks passed

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

servo / servo

implement StyleSheet.disabled #14340

implement StyleSheet.disabled #14340

heycam commented Nov 23, 2016 •

edited by larsbergstrom

highfive commented Nov 23, 2016

highfive commented Nov 23, 2016

heycam commented Nov 23, 2016

bors-servo commented Nov 23, 2016

bors-servo commented Nov 23, 2016

heycam commented Nov 23, 2016

bors-servo commented Nov 23, 2016

bors-servo commented Nov 23, 2016

heycam commented Nov 23, 2016

heycam commented Nov 23, 2016

bholley commented Nov 23, 2016

bors-servo commented Nov 23, 2016

heycam commented Nov 24, 2016

bors-servo commented Nov 24, 2016

heycam commented Nov 24, 2016

bors-servo commented Nov 24, 2016

jdm commented Nov 24, 2016

bors-servo commented Nov 24, 2016

bors-servo commented Nov 24, 2016

Manishearth left a comment

This comment has been minimized.

heycam commented Nov 25, 2016

bors-servo commented Nov 25, 2016

bors-servo commented Nov 25, 2016

bors-servo commented Nov 25, 2016

heycam commented Nov 25, 2016

bors-servo commented Nov 25, 2016

bors-servo commented Nov 25, 2016

bors-servo commented Nov 25, 2016

bors-servo commented Nov 25, 2016

bors-servo commented Nov 25, 2016

bors-servo commented Nov 25, 2016

servo / servo

Join GitHub today

implement StyleSheet.disabled #14340

implement StyleSheet.disabled #14340

Conversation

heycam commented Nov 23, 2016 • edited by larsbergstrom

highfive commented Nov 23, 2016

highfive commented Nov 23, 2016

heycam commented Nov 23, 2016

bors-servo commented Nov 23, 2016

bors-servo commented Nov 23, 2016

heycam commented Nov 23, 2016

bors-servo commented Nov 23, 2016

bors-servo commented Nov 23, 2016

heycam commented Nov 23, 2016

heycam commented Nov 23, 2016

bholley commented Nov 23, 2016

bors-servo commented Nov 23, 2016

heycam commented Nov 24, 2016

bors-servo commented Nov 24, 2016

heycam commented Nov 24, 2016

bors-servo commented Nov 24, 2016

jdm commented Nov 24, 2016

bors-servo commented Nov 24, 2016

bors-servo commented Nov 24, 2016

Manishearth left a comment

This comment has been minimized.

Manishearth Nov 25, 2016

heycam commented Nov 25, 2016

bors-servo commented Nov 25, 2016

bors-servo commented Nov 25, 2016

bors-servo commented Nov 25, 2016

heycam commented Nov 25, 2016

bors-servo commented Nov 25, 2016

bors-servo commented Nov 25, 2016

bors-servo commented Nov 25, 2016

bors-servo commented Nov 25, 2016

bors-servo commented Nov 25, 2016

bors-servo commented Nov 25, 2016

heycam commented Nov 23, 2016 •

edited by larsbergstrom