Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore the layout trace viewer #13432

Merged
merged 1 commit into from Oct 17, 2016
Merged

Conversation

@shinglyu
Copy link
Member

shinglyu commented Sep 26, 2016

This patch restores the layout trace viewer removed in e7510ab , with some changes that makes it work with #13214

Sorry for the minified 3rd party CSS frameworks, it was from the original version and I haven't got time to replace them with hand-crafted CSS.


  • ./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 is a stand-alone debugging tool

This change is Reviewable

@shinglyu
Copy link
Member Author

shinglyu commented Sep 26, 2016

This is helpful for my flexbox work.
I'll also try to update the wiki to document this after the patch merged.

@Manishearth
Copy link
Member

Manishearth commented Sep 26, 2016

@highfive highfive assigned mbrubeck and unassigned Manishearth Sep 26, 2016
Copy link
Contributor

mbrubeck left a comment

Works great! r=mbrubeck with some minor fixes.

or

```
./servo --trace-layout <url>

This comment has been minimized.

Copy link
@mbrubeck

mbrubeck Sep 26, 2016

Contributor

This doesn't seem to work. Should it be removed? Or changed to use -Z trace-layout?

/*
$.getJSON( "layout_trace.json", function(data) {
new_data_loaded(data);
});*/

This comment has been minimized.

Copy link
@mbrubeck

mbrubeck Sep 26, 2016

Contributor

Should this be removed?

@@ -0,0 +1 @@
.list-group-item{cursor:pointer}span.indent{margin-left:10px;margin-right:10px}span.icon{margin-right:5px}

This comment has been minimized.

Copy link
@mbrubeck

mbrubeck Sep 26, 2016

Contributor

Could you please add *.min.css as an excluded filename for the mach grep command in python/servo/devenv_commands.py? (*.min.js is already excluded.)

This comment has been minimized.

Copy link
@shinglyu

shinglyu Oct 17, 2016

Author Member

Fixed!

@shinglyu shinglyu force-pushed the shinglyu:layout_viewer_clean branch from 891b596 to 3044c6a Oct 13, 2016
@shinglyu shinglyu mentioned this pull request Oct 13, 2016
4 of 5 tasks complete
@shinglyu shinglyu force-pushed the shinglyu:layout_viewer_clean branch from 3044c6a to 0cab050 Oct 17, 2016
@shinglyu
Copy link
Member Author

shinglyu commented Oct 17, 2016

Rebased to latest master to get rid of the CI failures.

@mbrubeck
Copy link
Contributor

mbrubeck commented Oct 17, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Oct 17, 2016

📌 Commit 0cab050 has been approved by mbrubeck

@bors-servo
Copy link
Contributor

bors-servo commented Oct 17, 2016

Testing commit 0cab050 with merge 0af9be9...

bors-servo added a commit that referenced this pull request Oct 17, 2016
Restore the layout trace viewer

<!-- Please describe your changes on the following line: -->
This patch restores the layout trace viewer removed in e7510ab , with some changes that makes it work with #13214

Sorry for the minified 3rd party CSS frameworks, it was from the original version and I haven't got time to replace them with hand-crafted CSS.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [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).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because is a stand-alone debugging tool

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13432)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 17, 2016

@bors-servo bors-servo merged commit 0cab050 into servo:master Oct 17, 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
@shinglyu shinglyu mentioned this pull request Oct 19, 2016
3 of 5 tasks complete
bors-servo added a commit that referenced this pull request Nov 2, 2016
Migrated -Z trace-layout to serde_json

<!-- Please describe your changes on the following line: -->

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.
---

<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [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).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because it's a relatively low risk debug tool

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---

This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13740)

<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Nov 2, 2016
Migrated -Z trace-layout to serde_json

<!-- Please describe your changes on the following line: -->

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.
---

<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [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).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because it's a relatively low risk debug tool

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---

This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13740)

<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Nov 2, 2016
Layout viewer fixes

<!-- Please describe your changes on the following line: -->

This is a followup for #13432. This patch should be landed after #13740 to accommodate the change in JSON format in #13740. It also included some UI layout fixes to make the UI more readable. I'm splitting the commits for easier review, I'll squash them after a r+.
---

<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [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).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because it's just a external debug tool

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---

This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13829)

<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Nov 4, 2016
Migrated -Z trace-layout to serde_json

<!-- Please describe your changes on the following line: -->

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.
---

<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [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).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because it's a relatively low risk debug tool

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---

This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13740)

<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Nov 4, 2016
Migrated -Z trace-layout to serde_json

<!-- Please describe your changes on the following line: -->

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.
---

<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [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).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because it's a relatively low risk debug tool

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---

This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13740)

<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Nov 4, 2016
Migrated -Z trace-layout to serde_json

<!-- Please describe your changes on the following line: -->

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.
---

<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [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).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because it's a relatively low risk debug tool

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---

This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13740)

<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Nov 7, 2016
Migrated -Z trace-layout to serde_json

<!-- Please describe your changes on the following line: -->

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.
---

<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [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).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because it's a relatively low risk debug tool

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---

This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13740)

<!-- Reviewable:end -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.