Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #13924 - cynicaldevil:text-overflow, r=emilio

Browse source 
implemented string-valued text-overflow

<!-- 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
- [X] These changes fix #13709

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

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

cc @Manishearth
The lorem-ipsum example from MDN works as expected.

<!-- 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/13924)

<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-11-09 16:36:45 -06:00 • committed by GitHub
commit a91f48ee05
7 changed files with 100 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5496,18 +5496,6 @@
"url": "/_mozilla/css/text_node_opacity.html"
}
],
"css/text_overflow_a.html": [
{
"path": "css/text_overflow_a.html",
"references": [
[
"/_mozilla/css/text_overflow_ref.html",
"!="
]
],
"url": "/_mozilla/css/text_overflow_a.html"
}
],
"css/text_overflow_basic_a.html": [
{
"path": "css/text_overflow_basic_a.html",
@ -5520,6 +5508,30 @@
"url": "/_mozilla/css/text_overflow_basic_a.html"
}
],
"css/text_overflow_ellipsis.html": [
{
"path": "css/text_overflow_ellipsis.html",
"references": [
[
"/_mozilla/css/text_overflow_ref.html",
"!="
]
],
"url": "/_mozilla/css/text_overflow_ellipsis.html"
}
],
"css/text_overflow_string.html": [
{
"path": "css/text_overflow_string.html",
"references": [
[
"/_mozilla/css/text_overflow_ref.html",
"!="
]
],
"url": "/_mozilla/css/text_overflow_string.html"
}
],
"css/text_shadow_blur_a.html": [
{
"path": "css/text_shadow_blur_a.html",
@ -20364,18 +20376,6 @@
"url": "/_mozilla/css/text_node_opacity.html"
}
],
"css/text_overflow_a.html": [
{
"path": "css/text_overflow_a.html",
"references": [
[
"/_mozilla/css/text_overflow_ref.html",
"!="
]
],
"url": "/_mozilla/css/text_overflow_a.html"
}
],
"css/text_overflow_basic_a.html": [
{
"path": "css/text_overflow_basic_a.html",
@ -20388,6 +20388,30 @@
"url": "/_mozilla/css/text_overflow_basic_a.html"
}
],
"css/text_overflow_ellipsis.html": [
{
"path": "css/text_overflow_ellipsis.html",
"references": [
[
"/_mozilla/css/text_overflow_ref.html",
"!="
]
],
"url": "/_mozilla/css/text_overflow_ellipsis.html"
}
],
"css/text_overflow_string.html": [
{
"path": "css/text_overflow_string.html",
"references": [
[
"/_mozilla/css/text_overflow_ref.html",
"!="
]
],
"url": "/_mozilla/css/text_overflow_string.html"
}
],
"css/text_shadow_blur_a.html": [
{
"path": "css/text_shadow_blur_a.html",

5
tests/wpt/mozilla/tests/css/text_overflow_a.html → tests/wpt/mozilla/tests/css/text_overflow_ellipsis.html
View file

@ -8,14 +8,13 @@ p {
background: gold;
text-overflow: ellipsis;
}
#hideme {
p.hidden {
overflow: hidden;
}
</style>
</head>
<body>
<p id=hideme>mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm</p>
<p>mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm</p>
<p class="hidden">mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm</p>
</body>
</html>

2
tests/wpt/mozilla/tests/css/text_overflow_ref.html
View file

@ -13,5 +13,3 @@ p {
<p>mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm</p>
</body>
</html>

20
tests/wpt/mozilla/tests/css/text_overflow_string.html Normal file
View file

@ -0,0 +1,20 @@
<!DOCTYPE html>
<html>
<head>
<link rel=mismatch href=text_overflow_ref.html>
<style>
p {
width: 128px;
background: gold;
text-overflow: "[..]";
}
p.hidden {
overflow: hidden;
}
</style>
</head>
<body>
<p>mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm</p>
<p class="hidden">mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm</p>
</body>
</html>