Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-19 12:25:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #12370 - emilio:wrap, r=mbrubeck

Browse source 
Fix line-breaking with white-space: pre-wrap/pre-line;

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

Not sure if this is the appropriate fix, but we'll know soon.

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

<!-- Either: -->
- [x] There are tests for these changes OR

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

r? @mbrubeck

<!-- 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/12370)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-07-11 01:08:57 -07:00 • committed by GitHub
commit 8ded106186
6 changed files with 74 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -6150,6 +6150,18 @@
"url": "/_mozilla/css/test_variable_serialization_specified.html"
}
],
"css/white-space-pre-line-long-line.html": [
{
"path": "css/white-space-pre-line-long-line.html",
"url": "/_mozilla/css/white-space-pre-line-long-line.html"
}
],
"css/white-space-pre-wrap-long-line.html": [
{
"path": "css/white-space-pre-wrap-long-line.html",
"url": "/_mozilla/css/white-space-pre-wrap-long-line.html"
}
],
"mozilla/DOMParser.html": [
{
"path": "mozilla/DOMParser.html",

20
tests/wpt/mozilla/tests/css/white-space-pre-line-long-line.html Normal file
View file

@ -0,0 +1,20 @@
<!doctype html>
<meta charset="utf-8">
<title>White space pre-line crashtest (#12369)</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<style>
div {
width: 70px;
white-space: pre-line;
}
</style>
<div>This is an actual loooooooong line
Line 2</div>
<script>
async_test(function(t) {
window.addEventListener('load', function() {
t.done();
});
});
</script>

20
tests/wpt/mozilla/tests/css/white-space-pre-wrap-long-line.html Normal file
View file

@ -0,0 +1,20 @@
<!doctype html>
<meta charset="utf-8">
<title>White space pre-wrap crashtest (#12369)</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<style>
div {
width: 70px;
white-space: pre-wrap;
}
</style>
<div>This is an actual loooooooong line
Line 2</div>
<script>
async_test(function(t) {
window.addEventListener('load', function() {
t.done();
});
});
</script>