Migrated -Z trace-layout to serde_json #13740

shinglyu · 2016-10-13T06:53:57Z

Migrated the trace-layout code from old rustc-serialize to serde_json. This will help us iterate faster on the layout viewer (#13432), #13436, #12675 and fix #12936.

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

There are tests for these changes OR
These changes do not require tests because it's a relatively low risk debug tool

This change is

highfive · 2016-10-13T06:54:01Z

Heads up! This PR modifies the following files:

@bholley: components/style/logical_geometry.rs

highfive · 2016-10-13T06:54:02Z

Warning

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

nox · 2016-10-14T10:55:04Z

components/layout/Cargo.toml

 script_layout_interface = {path = "../script_layout_interface"}
 script_traits = {path = "../script_traits"}
 selectors = "0.13"
+serde = "0.8"
+serde_json = "0.8"


serde_derive should come before serde_json.

bors-servo · 2016-10-15T22:14:07Z

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

shinglyu · 2016-10-20T02:37:56Z

Just rebased to the latest master, @nox r?

bors-servo · 2016-10-27T02:51:15Z

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

shinglyu · 2016-10-28T02:50:10Z

@nox @asajeffrey r?

jdm · 2016-10-28T03:38:49Z

components/layout/flow_list.rs

+                    FlowClass::TableRowGroup => to_value(f.as_table_rowgroup()),
+                    FlowClass::TableRow => to_value(f.as_table_row()),
+                    FlowClass::TableCell => to_value(f.as_table_cell()),
+                    _ => { Value::Null }     // TODO: Support captions


We should probably use explicit variants here, to avoid incorrect defaults.

jdm · 2016-10-28T03:38:49Z

components/layout/fragment.rs

-        })
+impl Serialize for Fragment {
+    fn serialize<S: Serializer>(&self, serializer: &mut S) -> Result<(), S::Error>{
+        let mut state = try!(serializer.serialize_struct("fragment", 3)); //change the length!


I'm not sure what these comments mean.

jdm · 2016-10-28T03:38:49Z

components/layout/lib.rs

@@ -10,6 +10,9 @@
 #![feature(plugin)]
 #![feature(raw)]
 #![feature(step_by)]
+#![feature(proc_macro)]


Move these in alphabetical order.

jdm · 2016-10-28T03:38:49Z

components/layout/table_rowgroup.rs

-    fn encode<S: Encoder>(&self, e: &mut S) -> Result<(), S::Error> {
-        self.block_flow.encode(e)
+impl Serialize for TableRowGroupFlow {
+    fn serialize<S: Serializer>(&self, serializer: &mut S) -> Result<(), S::Error>{


nit: space before {

jdm · 2016-10-28T03:38:49Z

components/layout/block.rs

-    fn encode<S: Encoder>(&self, e: &mut S) -> Result<(), S::Error> {
-        self.bits().encode(e)
+impl Serialize for BlockFlowFlags {
+    fn serialize<S: Serializer>(&self, serializer: &mut S) -> Result<(), S::Error>{


nit: space before {

bors-servo · 2016-10-28T15:20:50Z

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

jdm · 2016-10-31T14:32:34Z

components/layout/lib.rs

 #![feature(raw)]
 #![feature(step_by)]
+#![feature(structural_match)]
+#![feature(rustc_attrs)]


What's this feature for?

These are some features required by serde_json, but looks like they are no longer needed in rustc-1.14.0, I'll try removing them and see if it works.

ref: serde-rs/serde#567

Oh we don't need that anymore, I can compile with rustc-1.14.0 with them removed.

jdm · 2016-10-31T14:32:34Z

components/layout/table_row.rs

-    fn encode<S: Encoder>(&self, e: &mut S) -> Result<(), S::Error> {
-        self.block_flow.encode(e)
+impl Serialize for TableRowFlow {
+    fn serialize<S: Serializer>(&self, serializer: &mut S) -> Result<(), S::Error>{


nit: space before { (there are a bunch of other instances in this PR; search for >{)

jdm · 2016-11-04T20:18:40Z

@bors-servo: retry

#13776

bors-servo · 2016-11-04T20:54:58Z

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

bors-servo · 2016-11-04T21:53:37Z

💔 Test failed - mac-rel-wpt2

highfive · 2016-11-04T21:53:39Z

  ▶ TIMEOUT [expected CRASH] /_mozilla/mozilla/sigsegv.html
  │ 
  │ VMware, Inc.
  │ Gallium 0.4 on softpipe
  └ 3.3 (Core Profile) Mesa 12.0.1

bors-servo · 2016-11-04T23:04:57Z

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


        Migrated -Z trace-layout to serde_json

shinglyu · 2016-11-07T07:55:53Z

@bors-servo: retry, r=jdm

bors-servo · 2016-11-07T07:55:54Z

📌 Commit 8bea421 has been approved by jdm

bors-servo · 2016-11-07T08:15:04Z

⌛ Testing commit 8bea421 with merge 1c26f44...


        Auto merge of #13740 - shinglyu:layout_serde, r=jdm

Migrated -Z trace-layout to serde_json  Migrated the trace-layout code from old `rustc-serialize` to `serde_json`. This will help us iterate faster on the layout viewer (#13432), #13436, #12675 and fix #12936. ---  - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #12936 (github issue number if applicable).  - [ ] There are tests for these changes OR - [x] These changes do not require tests because it's a relatively low risk debug tool   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13740)

bors-servo · 2016-11-07T09:07: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


        Auto merge of #14124 - shinglyu:flexbox-trace, r=glennw

@jdm

Flexbox trace  This is a follow up for #13740, so r? @jdm The first patch enables JSON serialization for flexbox flows, the second one fixed format incompatibilities for the layout viewer. The 3rd and 4th patches are just layout viewer UI enhancements, we could split that to a spearate PR if you prefer. ---  - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #13846 (github issue number if applicable).  - [ ] There are tests for these changes OR - [x] These changes do not require tests because it's a trivial debug tool   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14124)

highfive assigned asajeffrey Oct 13, 2016

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

nox reviewed Oct 14, 2016

View changes

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

shinglyu force-pushed the shinglyu:layout_serde branch from c72fb44 to a488312 Oct 17, 2016

shinglyu mentioned this pull request Oct 19, 2016

Layout viewer fixes #13829

Merged

3 of 5 tasks complete

shinglyu force-pushed the shinglyu:layout_serde branch from a488312 to b29cb8a Oct 20, 2016

shinglyu mentioned this pull request Oct 20, 2016

Implment layout tracing for flexbox #13846

Closed

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

shinglyu force-pushed the shinglyu:layout_serde branch from b29cb8a to 756f87c Oct 28, 2016

jdm requested changes Oct 28, 2016

View changes

jdm added S-needs-code-changes and removed S-awaiting-review S-needs-rebase labels Oct 28, 2016

jdm assigned jdm and unassigned asajeffrey Oct 28, 2016

shinglyu force-pushed the shinglyu:layout_serde branch from 756f87c to d318a2b Oct 28, 2016

highfive added S-awaiting-review and removed S-needs-code-changes labels Oct 28, 2016

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

jdm requested changes Oct 31, 2016

View changes

jdm added S-needs-code-changes and removed S-awaiting-review labels Oct 31, 2016

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

bors-servo mentioned this pull request Nov 4, 2016

Manually copy across a shader fix from WR. #14074

Merged

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

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

Migrated -Z trace-layout to serde_json

Loading status checks…

8bea421

shinglyu force-pushed the shinglyu:layout_serde branch from 10754ed to 8bea421 Nov 7, 2016

highfive added S-awaiting-review and removed S-tests-failed labels Nov 7, 2016

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

bors-servo mentioned this pull request Nov 7, 2016

Stop unnecessarily wrapping the response argument to http_redirect_fetch in Rc. #14105

Merged

bors-servo merged commit 8bea421 into servo:master Nov 7, 2016
2 of 3 checks passed

2 of 3 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details

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

homu Test successful
Details

highfive removed the S-awaiting-merge label Nov 7, 2016

bors-servo mentioned this pull request Nov 7, 2016

Use rayon to drive parallel layout and styling. #13641

Merged

0 of 5 tasks complete

This was referenced Nov 8, 2016

Flexbox trace #14124

Merged

Pretty print the flow tree to json (Fix #12675) #13092

Closed

nox mentioned this pull request Oct 5, 2017

Make FlexFlow work with trace-layout #13436

Open

servo / servo

Migrated -Z trace-layout to serde_json #13740

Migrated -Z trace-layout to serde_json #13740

shinglyu commented Oct 13, 2016 •

edited by larsbergstrom

highfive commented Oct 13, 2016

highfive commented Oct 13, 2016

This comment has been minimized.

bors-servo commented Oct 15, 2016

shinglyu commented Oct 20, 2016

bors-servo commented Oct 27, 2016

shinglyu commented Oct 28, 2016

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.

bors-servo commented Oct 28, 2016

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.

jdm commented Nov 4, 2016

bors-servo commented Nov 4, 2016

bors-servo commented Nov 4, 2016

highfive commented Nov 4, 2016

bors-servo commented Nov 4, 2016

shinglyu commented Nov 7, 2016

bors-servo commented Nov 7, 2016

bors-servo commented Nov 7, 2016

bors-servo commented Nov 7, 2016

servo / servo

Join GitHub today

Migrated -Z trace-layout to serde_json #13740

Migrated -Z trace-layout to serde_json #13740

Conversation

shinglyu commented Oct 13, 2016 • edited by larsbergstrom

highfive commented Oct 13, 2016

highfive commented Oct 13, 2016

This comment has been minimized.

bors-servo commented Oct 15, 2016

shinglyu commented Oct 20, 2016

bors-servo commented Oct 27, 2016

shinglyu commented Oct 28, 2016

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.

bors-servo commented Oct 28, 2016

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.

jdm commented Nov 4, 2016

bors-servo commented Nov 4, 2016

bors-servo commented Nov 4, 2016

highfive commented Nov 4, 2016

bors-servo commented Nov 4, 2016

shinglyu commented Nov 7, 2016

bors-servo commented Nov 7, 2016

bors-servo commented Nov 7, 2016

bors-servo commented Nov 7, 2016

shinglyu commented Oct 13, 2016 •

edited by larsbergstrom