stylo: Rearrange some data structures in preparation for the new incremental restyle algorithm #13863

bholley · 2016-10-21T00:43:47Z

This change is

highfive · 2016-10-21T00:43:50Z

Heads up! This PR modifies the following files:

@KiChjang: components/script_layout_interface/wrapper_traits.rs, components/script/layout_wrapper.rs, components/script_layout_interface/lib.rs, components/script/script_thread.rs
@fitzgen: components/script_layout_interface/wrapper_traits.rs, components/script/layout_wrapper.rs, components/script_layout_interface/lib.rs, components/script/script_thread.rs
@emilio: components/style/gecko/wrapper.rs, components/layout/traversal.rs, ports/geckolib/glue.rs, components/style/gecko_bindings/structs_release.rs, components/style/gecko/traversal.rs, components/style/data.rs, components/style/gecko_bindings/structs_debug.rs, components/style/dom.rs, components/style/binding_tools/regen.py, components/layout/wrapper.rs, components/style/traversal.rs, components/style/matching.rs

highfive · 2016-10-21T00:43:51Z

Warning

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

bholley · 2016-10-21T00:43:55Z

@bors-servo try

bors-servo · 2016-10-21T00:43:58Z

🔒 Merge conflict

bholley · 2016-10-21T00:45:33Z

@bors-servo try

bors-servo · 2016-10-21T00:45:36Z

⌛ Trying commit 3001bda with merge 54fec86...


        Auto merge of #13863 - bholley:shuffle_data_structures, r=<try>

stylo: Rearrange some data structures in preparation for the new incremental restyle algorithm  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13863)

bors-servo · 2016-10-21T01:46:55Z

💔 Test failed - linux-rel-css

bholley · 2016-10-21T02:46:45Z

@bors-servo try


        Auto merge of #13863 - bholley:shuffle_data_structures, r=<try>

stylo: Rearrange some data structures in preparation for the new incremental restyle algorithm  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13863)

bors-servo · 2016-10-21T02:46:48Z

⌛ Trying commit c3d5214 with merge e8d1726...

bors-servo · 2016-10-21T04:28:26Z

☀️ 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

bholley · 2016-10-21T04:39:12Z

r? @emilio

bors-servo · 2016-10-21T07:35:53Z

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

emilio

A few comments, the rest looks ok, but I'd like to review it again once the comments are addressed and this is rebased.

emilio · 2016-10-21T10:40:24Z

components/style/data.rs

+        };
+    }
+
+    pub fn ensure_restyle_data(&mut self) {


This doesn't seem to be called. It's fine if it's intentional, but if not should be removed.

emilio · 2016-10-21T10:40:24Z

components/style/data.rs

+    /// immutable, but for now we need to mutate it a bit before styling to
+    /// handle animations.
+    EmptyPrevious,
+    Previous(NodeStyles),


I think size_of::<NodeStyles>() should be equal to size_of::<Option<NodeStyles>>, since it contains an arc, and the discriminant of the option becomes the nullness of the Arc: https://play.rust-lang.org/?gist=bc261480736b63367ed39cc9c4feee82&version=stable&backtrace=0

So I think if it's clearer we should just use Option<NodeStyles>. Otherwise remove the comment about packing.

emilio · 2016-10-21T10:40:24Z

components/style/data.rs

+        }
+    }
+
+    pub fn gather_previous_styles<F>(&mut self, f: F)


I think to stick to the convention that Option has, we should call this take_previous_styles. I think the fact that the closure is only executed if it's Uninitialized is not documented nowhere.

Probably the more rusty name is something like take_previous_styles_or_else.

Also, if we change to Option<NodeStyles> instead of EmptyPrevious, this function would be way more idiomatic if you ask me.

emilio · 2016-10-21T10:40:24Z

components/style/data.rs

+impl RestyleData {
+    fn new() -> Self {
+        RestyleData {
+            _dummy: 42,


bholley · 2016-10-21T19:34:32Z

@bors-servo r=emilio

bors-servo · 2016-10-21T19:34:33Z

📌 Commit 273bd4e has been approved by emilio

bors-servo · 2016-10-21T19:34:38Z

🔒 Merge conflict

bholley · 2016-10-21T19:38:25Z

@bors-servo r=emilio

bors-servo · 2016-10-21T19:38:25Z

📌 Commit ae7efd4 has been approved by emilio

bors-servo · 2016-10-21T19:38:27Z

⌛ Testing commit ae7efd4 with merge 1fdf643...


        Auto merge of #13863 - bholley:shuffle_data_structures, r=emilio

stylo: Rearrange some data structures in preparation for the new incremental restyle algorithm  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13863)

bors-servo · 2016-10-21T19:52:16Z

💔 Test failed - windows-dev


        Rearrange some data structures in preparation for the new incremental…

… restyle algorithm. MozReview-Commit-ID: 8iOALQylOuK

bholley · 2016-10-21T20:00:22Z

@bors-servo r=emilio

bors-servo · 2016-10-21T20:00:22Z

📌 Commit adf0fe9 has been approved by emilio

bors-servo · 2016-10-21T20:50:49Z

⌛ Testing commit adf0fe9 with merge 9cbac40...


        Auto merge of #13863 - bholley:shuffle_data_structures, r=emilio

stylo: Rearrange some data structures in preparation for the new incremental restyle algorithm  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13863)

bors-servo · 2016-10-21T21:34:40Z

💔 Test failed - mac-rel-css

bholley · 2016-10-21T21:42:12Z

@bors-servo retry #13887

bors-servo · 2016-10-21T21:42:14Z

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

addressed.

bors-servo · 2016-10-21T22:40:34Z

☀️ 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 glennw Oct 21, 2016

highfive added the S-awaiting-review label Oct 21, 2016

bholley force-pushed the bholley:shuffle_data_structures branch from 8fe5efb to 3001bda Oct 21, 2016

bholley unassigned glennw Oct 21, 2016

highfive added the S-tests-failed label Oct 21, 2016

bholley force-pushed the bholley:shuffle_data_structures branch from 3001bda to c3d5214 Oct 21, 2016

highfive removed the S-tests-failed label Oct 21, 2016

bholley force-pushed the bholley:shuffle_data_structures branch from c3d5214 to fa54cd7 Oct 21, 2016

highfive assigned emilio Oct 21, 2016

highfive added the S-needs-rebase label Oct 21, 2016

emilio reviewed Oct 21, 2016

View changes

bholley force-pushed the bholley:shuffle_data_structures branch from fa54cd7 to 273bd4e Oct 21, 2016

jdm removed the S-awaiting-review label Oct 21, 2016

bholley force-pushed the bholley:shuffle_data_structures branch from 273bd4e to ae7efd4 Oct 21, 2016

bholley removed the S-needs-rebase label Oct 21, 2016

bholley force-pushed the bholley:shuffle_data_structures branch from ae7efd4 to 6e11e35 Oct 21, 2016

Rearrange some data structures in preparation for the new incremental…

Loading status checks…

adf0fe9

… restyle algorithm. MozReview-Commit-ID: 8iOALQylOuK

bholley force-pushed the bholley:shuffle_data_structures branch from 6e11e35 to adf0fe9 Oct 21, 2016

highfive added the S-awaiting-merge label Oct 21, 2016

highfive added S-tests-failed and removed S-awaiting-merge labels Oct 21, 2016

bholley mentioned this pull request Oct 21, 2016

Intermittent failure in /css-transitions-1_dev/html/events-004.htm: #13887

Closed

bors-servo mentioned this pull request Oct 21, 2016

Rule tree, v1 #13202

Merged

3 of 3 tasks complete

bholley deleted the bholley:shuffle_data_structures branch Oct 30, 2016

servo / servo

stylo: Rearrange some data structures in preparation for the new incremental restyle algorithm #13863

stylo: Rearrange some data structures in preparation for the new incremental restyle algorithm #13863

bholley commented Oct 21, 2016 •

edited by larsbergstrom

highfive commented Oct 21, 2016

highfive commented Oct 21, 2016

bholley commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bholley commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bholley commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bholley commented Oct 21, 2016

bors-servo commented Oct 21, 2016

emilio left a comment •

edited

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bholley commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bholley commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bholley commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bholley commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bors-servo commented Oct 21, 2016

servo / servo

Join GitHub today

stylo: Rearrange some data structures in preparation for the new incremental restyle algorithm #13863

stylo: Rearrange some data structures in preparation for the new incremental restyle algorithm #13863

Conversation

bholley commented Oct 21, 2016 • edited by larsbergstrom

highfive commented Oct 21, 2016

highfive commented Oct 21, 2016

bholley commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bholley commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bholley commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bholley commented Oct 21, 2016

bors-servo commented Oct 21, 2016

emilio left a comment • edited

This comment has been minimized.

emilio Oct 21, 2016

This comment has been minimized.

emilio Oct 21, 2016

This comment has been minimized.

emilio Oct 21, 2016

This comment has been minimized.

bholley Oct 21, 2016

This comment has been minimized.

emilio Oct 21, 2016

bholley commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bholley commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bholley commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bholley commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bors-servo commented Oct 21, 2016

bholley commented Oct 21, 2016 •

edited by larsbergstrom

emilio left a comment •

edited