Skip to content

/ servo

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

stylo: Don't calculate restyle damage on text nodes #12957

Merged
merged 1 commit into from Sep 4, 2016
Merged

stylo: Don't calculate restyle damage on text nodes #12957

merged 1 commit into from Sep 4, 2016

Conversation

@emilio
Copy link
Member

emilio commented Aug 20, 2016 •
edited by larsbergstrom

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • There are tests for these changes (the Servo-side, that is)

This change is Reviewable
@highfive
Copy link

highfive commented Aug 20, 2016

Heads up! This PR modifies the following files:

  • @bholley: components/style/properties/gecko.mako.rs, components/style/matching.rs
@highfive
Copy link

highfive commented Aug 20, 2016

warning Warning warning

  • These commits modify style code, but no tests are modified. Please consider adding a test!
@emilio
Copy link
Member Author

emilio commented Aug 20, 2016

@bors-servo: try
@bors-servo
Copy link
Contributor

bors-servo commented Aug 20, 2016

⌛ Trying commit a34b8b5 with merge 0660fec...
bors-servo added a commit that referenced this pull request Aug 20, 2016
@bors-servo
Auto merge of #12957 - emilio:stylo-pseudos, r=<try>
Loading status checks…
0660fec 
stylo: Don't calculate restyle damage on text nodes

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

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

<!-- Either: -->
- [x] There are tests for these changes (the Servo-side, that is)

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

bors-servo commented Aug 21, 2016

💔 Test failed - linux-rel
@emilio
Copy link
Member Author

emilio commented Aug 21, 2016 

  ▶ TIMEOUT [expected PASS] /css-backgrounds-3_dev/html4/background-clip-008.htm
  │ 
  │ Xlib:  extension "XFree86-VidModeExtension" missing on display ":0".
  │ Shutting down the Constellation after generating an output file or exit flag specified
  │ Xlib:  extension "XFree86-VidModeExtension" missing on display ":0".
  │ failed to receive response to font request: IoError(Error { repr: Os { code: 104, message: "Connection reset by peer" } }) (thread LayoutWorker worker 2/12, at ../src/libcore/result.rs:788)
  │ stack backtrace:
  │    0:     0x7fa9f86304ad - backtrace::backtrace::trace::h22a738598d75d447
  │    1:     0x7fa9f8630b72 - backtrace::capture::Backtrace::new::h1a277804460ccff5
  │    2:     0x7fa9f71769d3 - servo::main::_$u7b$$u7b$closure$u7d$$u7d$::h5d02d94265372533
  │    3:     0x7fa9f8bb5db5 - std::panicking::rust_panic_with_hook::h2224f33fb7bf2f4c
  │    4:     0x7fa9f8bb5c82 - std::panicking::begin_panic::hcb11a4dc6d779ae5
  │    5:     0x7fa9f8bb5bb0 - std::panicking::begin_panic_fmt::h310416c62f3935b3
  │    6:     0x7fa9f8bb5b31 - rust_begin_unwind
  │    7:     0x7fa9f8bf368f - core::panicking::panic_fmt::hc5789f4e80194729
  │    8:     0x7fa9f840fa84 - core::result::unwrap_failed::hf5aa69a45c05e51d
  │    9:     0x7fa9f8435e87 - gfx::font_cache_thread::FontCacheThread::find_font_template::h9b98a752ba726588
  │   10:     0x7fa9f84377aa - gfx::font_context::FontContext::layout_font_group_for_style::hcc9bf0ef045ff615
  │   11:     0x7fa9f834bd4e - layout::text::TextRunScanner::scan_for_runs::h657342161e02a5d4
  │   12:     0x7fa9f751c64e - _<layout..construct..FlowConstructor<'a, ConcreteThreadSafeLayoutNode>>::build_flow_for_block_starting_with_fragments::h1fd76c1d1b62f62f
  │   13:     0x7fa9f751a997 - _<layout..construct..FlowConstructor<'a, ConcreteThreadSafeLayoutNode>>::build_flow_for_block_like::h67912ed999290e5f
  │   14:     0x7fa9f7519bad - _<layout..construct..FlowConstructor<'a, ConcreteThreadSafeLayoutNode>>::build_flow_for_block::h73a2d7f4e4e395c8
  │   15:     0x7fa9f74b3fbf - _<layout..construct..FlowConstructor<'a, ConcreteThreadSafeLayoutNode> as layout..traversal..PostorderNodeMutTraversal<ConcreteThreadSafeLayoutNode>>::process::h9c5196d0461c79d0
  │   16:     0x7fa9f74aab6a - _<layout..traversal..RecalcStyleAndConstructFlows<'lc> as style..traversal..DomTraversalContext<N>>::process_postorder::h275508dfcaaba20e
  │   17:     0x7fa9f7502722 - style::parallel::top_down_dom::hbe498c102694394c
  │   18:     0x7fa9f74c929e - std::panicking::try::do_call::h09e8c660e3e8eae6
  │   19:     0x7fa9f8bbe096 - __rust_maybe_catch_panic
  │   20:     0x7fa9f74f0cfa - _<F as alloc..boxed..FnBox<A>>::call_box::h3f3716f285c78ec5
  │   21:     0x7fa9f8bb4162 - std::sys::thread::Thread::new::thread_start::he0bf102845911132
  │   22:     0x7fa9f508e183 - start_thread
  │   23:     0x7fa9f4ba537c - clone
  │   24:                0x0 - <unknown>
  └ ERROR:servo: failed to receive response to font request: IoError(Error { repr: Os { code: 104, message: "Connection reset by peer" } })
@emilio
Copy link
Member Author

emilio commented Aug 21, 2016

Seems like an spurious failure (#12872?):

ERROR:servo: failed to receive response to font request: IoError(Error { repr: Os { code: 104, message: "Connection reset by peer" } })

@bors-servo: retry
@bors-servo
Copy link
Contributor

bors-servo commented Aug 21, 2016

⌛ Trying commit a34b8b5 with merge 5b65f78...
bors-servo added a commit that referenced this pull request Aug 21, 2016
@bors-servo
Auto merge of #12957 - emilio:stylo-pseudos, r=<try>
Loading status checks…
5b65f78 
stylo: Don't calculate restyle damage on text nodes

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

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

<!-- Either: -->
- [x] There are tests for these changes (the Servo-side, that is)

<!-- 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/12957)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 21, 2016

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev
@emilio
Copy link
Member Author

emilio commented Aug 21, 2016

r? @bholley
@highfive highfive assigned bholley and unassigned nox Aug 21, 2016
@bholley
Copy link
Contributor

bholley commented Aug 22, 2016

Per the discussion at https://bugzilla.mozilla.org/show_bug.cgi?id=1296556#c12 , I'm not sure we need the MatchesNoRules stuff anymore. We might need it at some point though, so if you get rid of it please attach it as a patch to bug 1296556 for archival.
@emilio
style: Avoid computing and storing change hints for text nodes.
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
Loading status checks…
9feea76
@emilio emilio force-pushed the emilio:stylo-pseudos branch from a34b8b5 to 9feea76 Aug 22, 2016
@bholley
Copy link
Contributor

bholley commented Aug 23, 2016

lgtm. @bors-servo delegate+
@bors-servo
Copy link
Contributor

bors-servo commented Aug 23, 2016

✌️ @emilio can now approve this pull request
@emilio
Copy link
Member Author

emilio commented Sep 4, 2016

@bors-servo: r=bholley

  • Relevant changes landed on central.
@bors-servo
Copy link
Contributor

bors-servo commented Sep 4, 2016

📌 Commit 9feea76 has been approved by bholley
@bors-servo
Copy link
Contributor

bors-servo commented Sep 4, 2016

⌛ Testing commit 9feea76 with merge 1fd745a...
bors-servo added a commit that referenced this pull request Sep 4, 2016
@bors-servo
Auto merge of #12957 - emilio:stylo-pseudos, r=bholley
Loading status checks…
1fd745a 
stylo: Don't calculate restyle damage on text nodes

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

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

<!-- Either: -->
- [x] There are tests for these changes (the Servo-side, that is)

<!-- 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/12957)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 4, 2016

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev
@bors-servo bors-servo merged commit 9feea76 into servo:master Sep 4, 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@bholley bholley

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@emilio @highfive @bors-servo @bholley @nox
You can’t perform that action at this time.