Reduce LayoutTaskData to the fields used for RPC. #8378

Ms2ger · 2015-11-06T17:35:18Z

highfive · 2015-11-06T17:35:22Z

Warning

These commits modify layout code, but no reftests are modified. Please consider adding a reftest!

eefriedman · 2015-11-06T19:27:25Z

Nice simplification... except that I'll have to redo large chunks of it to rebase #7524 on top of this.

The problem is that if you have an &mut LayoutTask floating around, it's impossible to borrow the Stylist... and SharedLayoutContext does precisely that. The borrow checker just can't see it at the moment because SharedLayoutContext uses a raw pointer.

Review status: 0 of 9 files reviewed at latest revision, 1 unresolved discussion.

^{components/layout/layout_task.rs, line 332 [r1] (raw file):}
Accidentally left this in?

Comments from the review on Reviewable.io

Ms2ger · 2015-11-06T19:58:06Z

I think anything that prevents us from using &mut LayoutTask is problematic; you see how much pointless locking I'm removing. I'll see if I can think of something for Stylist.

Review status: 0 of 9 files reviewed at latest revision, 1 unresolved discussion.

^{components/layout/layout_task.rs, line 332 [r1] (raw file):}
No, I believe it should be used in some places where it isn't: #8358

Comments from the review on Reviewable.io

bors-servo · 2015-11-06T22:34:08Z

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

bors-servo · 2015-11-07T19:42:18Z

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


        Consolidate ProfilerMetadata and TimerMetadata.

There is no good reason to have the two types. This also means that the result of LayoutTask::profiler_metadata no longer borrows the LayoutTask, which I'll need later.


        Disentangle the message handling from the receiver selection in Layou…

…tTask::handle_request. This ensures no fields of the LayoutTask are borrowed when calling repaint or handle_request_helper, which I'll need later.


        Introduce a RwData struct.


        Move LayoutTask::first_reflow out of its Cell.

As the LayoutTask is uniquely owned, and we no longer have borrows of its fields hanging around, we can use mutable references to simplify some code.


        Make LayoutTask::solve_constraints a static method.

It does not use self.


        Make LayoutTask::solve_constraints_parallel a static method.

This matches LayoutTask::solve_constraints, and will be necessary when we borrow parallel_traversal directly from the LayoutTask.


        Move parallel_traversal from LayoutTaskData to LayoutTask.


        Remove unused RwData arguments from LayoutTask::exit_now and LayoutTa…

…sk::prepare_to_exit.


        Remove LayoutTaskData::image_cache_task.


        Move generation from LayoutTaskData to LayoutTask.


        Move new_animations_sender from LayoutTaskData to LayoutTask.


        Move new_animations_receiver from LayoutTaskData to LayoutTask.


        Move outstanding_web_fonts from LayoutTaskData to LayoutTask.


        Move root_flow from LayoutTaskData to LayoutTask.


        Move visible_rects from LayoutTaskData to LayoutTask.


        Move running_animations from LayoutTaskData to LayoutTask.

bors-servo · 2015-11-09T20:45:07Z

⌛ Testing commit 1919e19 with merge d24530a...


        Auto merge of #8378 - Ms2ger:rwdata, r=eefriedman

Reduce LayoutTaskData to the fields used for RPC.  [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8378)

bors-servo · 2015-11-09T21:14:19Z

💔 Test failed - mac-rel-wpt

jdm · 2015-11-09T21:33:09Z

Looking at the failure in the reftest analyzer, the screenshot is blank. Can you reproduce this failure?

eefriedman · 2015-11-09T23:01:24Z

The failed test is blank, white; given that the test has a green background, most likely reflow didn't finish before the screenshot was taken. Probably just an intermittent failure which happened to show up here, but I'll look a little more.

eefriedman · 2015-11-10T01:17:57Z

@bors-servo retry #8435

bors-servo · 2015-11-10T01:25:07Z

⌛ Testing commit 1919e19 with merge 894ad95...


        Auto merge of #8378 - Ms2ger:rwdata, r=eefriedman

Reduce LayoutTaskData to the fields used for RPC.  [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8378)

bors-servo · 2015-11-10T01:28:16Z

💔 Test failed - gonk

eefriedman · 2015-11-10T01:46:51Z

@bors-servo retry

bors-servo · 2015-11-10T02:17:46Z

⌛ Testing commit 1919e19 with merge 0d21158...


        Auto merge of #8378 - Ms2ger:rwdata, r=eefriedman

Reduce LayoutTaskData to the fields used for RPC.  [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8378)

bors-servo · 2015-11-10T02:45:36Z

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-ref-unit, mac-rel-css, mac-rel-wpt


        Issue servo#8378: bufferSubData and texImage2D argument sanity checks.


        Issue servo#8378: bufferSubData and texImage2D argument sanity checks.


        Issue servo#8378: bufferSubData and texImage2D argument sanity checks.


        Issue servo#8378: bufferSubData and texImage2D argument sanity checks.

highfive added the S-awaiting-review label Nov 6, 2015

eefriedman self-assigned this Nov 6, 2015

highfive added S-needs-rebase and removed S-awaiting-merge labels Nov 6, 2015

Ms2ger force-pushed the Ms2ger:rwdata branch from 3770ada to 0d88a2d Nov 7, 2015

Ms2ger mentioned this pull request Nov 7, 2015

Make Stylist no longer an unsafe pointer once we have fast RWArcs #2604

Closed

highfive added S-needs-rebase and removed S-awaiting-merge labels Nov 7, 2015

Ms2ger force-pushed the Ms2ger:rwdata branch from 0d88a2d to 22f951a Nov 8, 2015

Ms2ger added 16 commits Nov 6, 2015

Consolidate ProfilerMetadata and TimerMetadata.

ff0accc

There is no good reason to have the two types. This also means that the result of LayoutTask::profiler_metadata no longer borrows the LayoutTask, which I'll need later.

Disentangle the message handling from the receiver selection in Layou…

b8d8505

…tTask::handle_request. This ensures no fields of the LayoutTask are borrowed when calling repaint or handle_request_helper, which I'll need later.

Introduce a RwData struct.

3f4c734

Move LayoutTask::first_reflow out of its Cell.

8674345

As the LayoutTask is uniquely owned, and we no longer have borrows of its fields hanging around, we can use mutable references to simplify some code.

Make LayoutTask::solve_constraints a static method.

cc1b7ac

It does not use self.

Make LayoutTask::solve_constraints_parallel a static method.

49691c1

This matches LayoutTask::solve_constraints, and will be necessary when we borrow parallel_traversal directly from the LayoutTask.

Move parallel_traversal from LayoutTaskData to LayoutTask.

dcea03c

Remove unused RwData arguments from LayoutTask::exit_now and LayoutTa…

be178c0

…sk::prepare_to_exit.

Remove LayoutTaskData::image_cache_task.

880fb9b

Move generation from LayoutTaskData to LayoutTask.

bdfa5fe

Move new_animations_sender from LayoutTaskData to LayoutTask.

604d1e8

Move new_animations_receiver from LayoutTaskData to LayoutTask.

5e4039d

Move outstanding_web_fonts from LayoutTaskData to LayoutTask.

53da53e

Move root_flow from LayoutTaskData to LayoutTask.

e8f31f2

Move visible_rects from LayoutTaskData to LayoutTask.

ee2b77e

Move running_animations from LayoutTaskData to LayoutTask.

c469d09

highfive added S-awaiting-merge and removed S-awaiting-review labels Nov 9, 2015

highfive added S-tests-failed and removed S-awaiting-merge labels Nov 9, 2015

eefriedman mentioned this pull request Nov 10, 2015

Intermittent failure on /_mozilla/css/hide_after_create.html #8435

Closed

highfive added S-awaiting-merge and removed S-tests-failed labels Nov 10, 2015

highfive added S-tests-failed and removed S-awaiting-merge labels Nov 10, 2015

highfive added S-awaiting-merge and removed S-tests-failed labels Nov 10, 2015

Ms2ger deleted the Ms2ger:rwdata branch Nov 10, 2015

simartin added a commit to simartin/servo that referenced this pull request Dec 12, 2015

Issue servo#8378: bufferSubData and texImage2D argument sanity checks.

49edf0b

simartin added a commit to simartin/servo that referenced this pull request Dec 12, 2015

Issue servo#8378: bufferSubData and texImage2D argument sanity checks.

34f00f1

simartin added a commit to simartin/servo that referenced this pull request Dec 12, 2015

Issue servo#8378: bufferSubData and texImage2D argument sanity checks.

bde1325

simartin added a commit to simartin/servo that referenced this pull request Dec 12, 2015

Issue servo#8378: bufferSubData and texImage2D argument sanity checks.

f34d18c

servo / servo

Reduce LayoutTaskData to the fields used for RPC. #8378

Reduce LayoutTaskData to the fields used for RPC. #8378

Ms2ger commented Nov 6, 2015

highfive commented Nov 6, 2015

eefriedman commented Nov 6, 2015

Ms2ger commented Nov 6, 2015

bors-servo commented Nov 6, 2015

bors-servo commented Nov 7, 2015

bors-servo commented Nov 9, 2015

bors-servo commented Nov 9, 2015

jdm commented Nov 9, 2015

eefriedman commented Nov 9, 2015

eefriedman commented Nov 10, 2015

bors-servo commented Nov 10, 2015

bors-servo commented Nov 10, 2015

eefriedman commented Nov 10, 2015

bors-servo commented Nov 10, 2015

bors-servo commented Nov 10, 2015

servo / servo

Join GitHub today

Reduce LayoutTaskData to the fields used for RPC. #8378

Reduce LayoutTaskData to the fields used for RPC. #8378

Conversation

Ms2ger commented Nov 6, 2015

highfive commented Nov 6, 2015

eefriedman commented Nov 6, 2015

Ms2ger commented Nov 6, 2015

bors-servo commented Nov 6, 2015

bors-servo commented Nov 7, 2015

bors-servo commented Nov 9, 2015

bors-servo commented Nov 9, 2015

jdm commented Nov 9, 2015

eefriedman commented Nov 9, 2015

eefriedman commented Nov 10, 2015

bors-servo commented Nov 10, 2015

bors-servo commented Nov 10, 2015

eefriedman commented Nov 10, 2015

bors-servo commented Nov 10, 2015

bors-servo commented Nov 10, 2015