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

Auto merge of #11914 - notriddle:text_fragment_color_merge, r=jdm

Browse source 
Text fragment color merge

The display list item for a line of text has a single color assigned for
it, so text fragments with different colors cannot be merged.

There is no issue number for this, as far as I know. I found this while
trying an internal program that uses red asterisks for required text
fields.
____________________

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not fix an existing Github issue
- [X] There are tests for these changes OR

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11914)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-06-28 22:43:07 -05:00 • committed by GitHub
commit 5b20673d43
6 changed files with 49 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/wpt/metadata-css/css21_dev/html4/content-inherit-002.htm.ini
View file

@ -1,3 +0,0 @@
[content-inherit-002.htm]
type: reftest
expected: FAIL

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

@ -1272,6 +1272,18 @@
"url": "/_mozilla/css/clip_a.html"
}
],
"css/content_color.html": [
{
"path": "css/content_color.html",
"references": [
[
"/_mozilla/css/content_color_ref.html",
"=="
]
],
"url": "/_mozilla/css/content_color.html"
}
],
"css/counters_nested_a.html": [
{
"path": "css/counters_nested_a.html",
@ -8360,6 +8372,18 @@
"url": "/_mozilla/css/clip_a.html"
}
],
"css/content_color.html": [
{
"path": "css/content_color.html",
"references": [
[
"/_mozilla/css/content_color_ref.html",
"=="
]
],
"url": "/_mozilla/css/content_color.html"
}
],
"css/counters_nested_a.html": [
{
"path": "css/counters_nested_a.html",

8
tests/wpt/mozilla/tests/css/content_color.html Normal file
View file

@ -0,0 +1,8 @@
<!doctype html>
<meta charset="utf-8">
<title>Pseudo-elements can have color</title>
<link rel="match" href="content_color_ref.html">
<style>
span:after{content:"B";color:red}
</style>
<span>A</span>

7
tests/wpt/mozilla/tests/css/content_color_ref.html Normal file
View file

@ -0,0 +1,7 @@
<!DOCTYPE html>
<title>This test should have a red B and a black A</title>
<style>
#a { float: left }
#b { color: red }
</style>
<span id=a>A</span><span id=b>B</span>