diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-03-19 17:46:42 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-19 17:46:42 -0400 |
commit | e9fdcdc78584d0e7928ab132f4e2b2fd6fa95547 (patch) | |
tree | d14e0b1cb9a630c7cb5b57f890bceea3fb6d776f /components/script/stylesheet_loader.rs | |
parent | 42305e3c366fb06dcf21d18f3f111eb8ee139701 (diff) | |
parent | 4dadfd02078116fe97e2cebcc92568ea37b0a617 (diff) | |
download | servo-e9fdcdc78584d0e7928ab132f4e2b2fd6fa95547.tar.gz servo-e9fdcdc78584d0e7928ab132f4e2b2fd6fa95547.zip |
Auto merge of #20328 - Moggers:enable-debugger, r=jdm
Re-expose webrender debugger feature in components/servo
<!-- 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
- [ ] `./mach test-tidy` does not report any errors
```
Checking files for tidiness...
./Cargo.lock:1: duplicate versions for package `base64`
The following packages depend on version 0.3.1 from 'crates.io':
webrender
The following packages depend on version 0.6.0 from 'crates.io':
hyper
net
script
webdriver_server
./Cargo.lock:1: duplicate versions for package `bytes`
The following packages depend on version 0.3.0 from 'crates.io':
ws
The following packages depend on version 0.4.6 from 'crates.io':
ws
./Cargo.lock:1: duplicate versions for package `ws`
The following packages depend on version 0.6.0 from 'crates.io':
debugger
The following packages depend on version 0.7.3 from 'crates.io':
webrender
./Cargo.lock:1: duplicate versions for package `image`
The following packages depend on version 0.17.0 from 'crates.io':
webrender
The following packages depend on version 0.18.0 from 'crates.io':
compositing
net_traits
script
webdriver_server
```
What should I do about this?
- [x] These changes fix #20324 (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because: Not sure actually, do I need to write integration tests to make sure it builds with the feature enabled?
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- 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/20328)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/stylesheet_loader.rs')
0 files changed, 0 insertions, 0 deletions