Skip to content

GitLab

T
tangled
Commit 91e2b1e3 authored by kulshin's avatar kulshin Committed by Commit bot
Browse files
Options

Color emoji tests 

Add tests and Win10 expectations for color emoji.
Also fix an expectation for emoji fallback test to look for the color
emoji font first, which will be present on Win10, but not on Win7.

Skia change to enable color emoji on Win8.1+: https://codereview.chromium.org/1984943002/

BUG=333011

Review-Url: https://codereview.chromium.org/2003853002
Cr-Commit-Position: refs/heads/master@{#397752}
parent 13ff7bc5
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 4 deletions
third_party/WebKit/LayoutTests/TestExpectations
View file @ 91e2b1e3
...@@ -1090,12 +1090,11 @@ crbug.com/532643 [ Mac ] fast/events/hit-test-cache-scrollbar-no-crash.html [ Pa ...@@ -1090,12 +1090,11 @@ crbug.com/532643 [ Mac ] fast/events/hit-test-cache-scrollbar-no-crash.html [ Pa
crbug.com/532643 [ Mac ] virtual/trustedeventsdefaultaction/fast/events/hit-test-cache-scrollbar-no-crash.html [ Pass Failure ] crbug.com/532643 [ Mac ] virtual/trustedeventsdefaultaction/fast/events/hit-test-cache-scrollbar-no-crash.html [ Pass Failure ]
crbug.com/532643 [ Mac ] virtual/pointerevent/fast/events/hit-test-cache-scrollbar-no-crash.html [ Pass Failure ] crbug.com/532643 [ Mac ] virtual/pointerevent/fast/events/hit-test-cache-scrollbar-no-crash.html [ Pass Failure ]
# The Win10 result for fast/text/emoji-font-fallback-win.html does not match the description
crbug.com/527044 [ Win10 ] fast/text/emoji-font-fallback-win.html [ Failure ]
# Win7 does not support the needed DirectWrite APIs for font fallback # Win7 does not support the needed DirectWrite APIs for font fallback
crbug.com/459056 [ Win7 ] fast/text/font-fallback-win.html [ Failure ] crbug.com/459056 [ Win7 ] fast/text/font-fallback-win.html [ Failure ]
crbug.com/333011 [ Win7 Mac Linux ] fast/text/color-emoji.html [ NeedsRebaseline ]
crbug.com/525296 fast/css/font-load-while-styleresolver-missing.html [ Crash Failure Pass ] crbug.com/525296 fast/css/font-load-while-styleresolver-missing.html [ Crash Failure Pass ]
crbug.com/240576 fullscreen/api/element-ready-check-containing-iframe.html [ Timeout Failure Pass ] crbug.com/240576 fullscreen/api/element-ready-check-containing-iframe.html [ Timeout Failure Pass ]
......
third_party/WebKit/LayoutTests/fast/text/color-emoji.html 0 → 100644
View file @ 91e2b1e3
<html>
<body>
<p>Three different sizes. The large size in particular should appear detailed and not pixelated.
<p>🙉😻🐑🍼🍲😍<span style="font-size: 5px;">🙉😻🐑🍼🍲😍</span> <span style="font-size: 72px;">🙉😻🐑🍼🍲😍</span></p>
<p>For the following, the emoji colors should not change.<br>
The monkey should be colored, the sheep should be black outlined with a white body, etc.</p>
<p style="font-size: 24px; background-color: blue; width: 400px;">blue background: 🙉😻🐑🍼🍲😍</p>
<p style="font-size: 24px; color: red;">red text: 🙉😻🐑🍼🍲😍</p>
<div style="-webkit-transform: rotate(-45deg); width: 200px; height: 200px; left: 500px; top: 200px; position:absolute;">
<p style="font-size: 24px;">rotated emoji: 🙉😍<br><span style="color: green;">green text: 😻🍼</span><br><span style="background-color: purple;">purple bg: 🐑🍲</span></p>
</div>
<p>For the following, each emoji should appear in two different colors.<br>
Color swatches should not be visible.
<p style="font-size: 24px;">zero-width-joiners: ✌&zwj;&#x1f3ff;✌&zwj;&#x1f3fc;👯&zwj;&#x1f3fb;👯&zwj;&#x1f3ff;👲&zwj;&#x1f3fd;👲&zwj;&#x1f3fb;</p>
</body>
</html>
third_party/WebKit/LayoutTests/fast/text/emoji-font-fallback-win-expected.html
View file @ 91e2b1e3
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<title>'GRINNING FACE WITH SMILING EYES' (U+1F601)</title> <title>'GRINNING FACE WITH SMILING EYES' (U+1F601)</title>
</head> </head>
<body> <body>
<p style="font-family: Segoe UI Symbol;">&#x1f601;😁😜</p> <p style="font-family: Segoe UI Emoji, Segoe UI Symbol;">&#x1f601;😁😜</p>
<p>There should be three smiling emojis above.</p> <p>There should be three smiling emojis above.</p>
</body> </body>
</html> </html>
third_party/WebKit/LayoutTests/platform/win/fast/text/color-emoji-expected.txt 0 → 100644
View file @ 91e2b1e3
layer at (0,0) size 800x600
LayoutView at (0,0) size 800x600
layer at (0,0) size 800x600
LayoutBlockFlow {HTML} at (0,0) size 800x600
LayoutBlockFlow {BODY} at (8,8) size 784x568
LayoutBlockFlow {P} at (0,0) size 784x18
LayoutText {#text} at (0,0) size 577x17
text run at (0,0) width 577: "Three different sizes. The large size in particular should appear detailed and not pixelated."
LayoutBlockFlow {P} at (0,34) size 784x96
LayoutText {#text} at (0,64) size 96x17
text run at (0,64) width 96: "\x{D83D}\x{DE49}\x{D83D}\x{DE3B}\x{D83D}\x{DC11}\x{D83C}\x{DF7C}\x{D83C}\x{DF72}\x{D83D}\x{DE0D}"
LayoutInline {SPAN} at (0,0) size 30x5
LayoutText {#text} at (96,74) size 30x5
text run at (96,74) width 30: "\x{D83D}\x{DE49}\x{D83D}\x{DE3B}\x{D83D}\x{DC11}\x{D83C}\x{DF7C}\x{D83C}\x{DF72}\x{D83D}\x{DE0D}"
LayoutText {#text} at (126,64) size 4x17
text run at (126,64) width 4: " "
LayoutInline {SPAN} at (0,0) size 432x80
LayoutText {#text} at (130,14) size 432x80
text run at (130,14) width 432: "\x{D83D}\x{DE49}\x{D83D}\x{DE3B}\x{D83D}\x{DC11}\x{D83C}\x{DF7C}\x{D83C}\x{DF72}\x{D83D}\x{DE0D}"
LayoutBlockFlow {P} at (0,146) size 784x36
LayoutText {#text} at (0,0) size 348x17
text run at (0,0) width 348: "For the following, the emoji colors should not change."
LayoutBR {BR} at (347,14) size 1x0
LayoutText {#text} at (0,18) size 576x17
text run at (0,18) width 576: "The monkey should be colored, the sheep should be black outlined with a white body, etc."
LayoutBlockFlow {P} at (0,206) size 400x32 [bgcolor=#0000FF]
LayoutText {#text} at (0,5) size 318x26
text run at (0,5) width 318: "blue background: \x{D83D}\x{DE49}\x{D83D}\x{DE3B}\x{D83D}\x{DC11}\x{D83C}\x{DF7C}\x{D83C}\x{DF72}\x{D83D}\x{DE0D}"
LayoutBlockFlow {P} at (0,262) size 784x32 [color=#FF0000]
LayoutText {#text} at (0,5) size 230x26
text run at (0,5) width 230: "red text: \x{D83D}\x{DE49}\x{D83D}\x{DE3B}\x{D83D}\x{DC11}\x{D83C}\x{DF7C}\x{D83C}\x{DF72}\x{D83D}\x{DE0D}"
LayoutBlockFlow {P} at (0,318) size 784x36
LayoutText {#text} at (0,0) size 434x17
text run at (0,0) width 434: "For the following, each emoji should appear in two different colors."
LayoutBR {BR} at (433,14) size 1x0
LayoutText {#text} at (0,18) size 240x17
text run at (0,18) width 240: "Color swatches should not be visible."
LayoutBlockFlow {P} at (0,378) size 784x32
LayoutText {#text} at (0,5) size 434x26
text run at (0,5) width 434: "zero-width-joiners: \x{270C}\x{200D}\x{D83C}\x{DFFF}\x{270C}\x{200D}\x{D83C}\x{DFFC}\x{D83D}\x{DC6F}\x{200D}\x{D83C}\x{DFFB}\x{D83D}\x{DC6F}\x{200D}\x{D83C}\x{DFFF}\x{D83D}\x{DC72}\x{200D}\x{D83C}\x{DFFD}\x{D83D}\x{DC72}\x{200D}\x{D83C}\x{DFFB}"
layer at (500,200) size 200x200
LayoutBlockFlow (positioned) {DIV} at (500,200) size 200x200
LayoutBlockFlow {P} at (0,24) size 200x96
LayoutText {#text} at (0,5) size 188x26
text run at (0,5) width 188: "rotated emoji: \x{D83D}\x{DE49}\x{D83D}\x{DE0D}"
LayoutBR {BR} at (187,26) size 1x0
LayoutInline {SPAN} at (0,0) size 156x26 [color=#008000]
LayoutText {#text} at (0,37) size 156x26
text run at (0,37) width 156: "green text: \x{D83D}\x{DE3B}\x{D83C}\x{DF7C}"
LayoutBR {BR} at (155,58) size 1x0
LayoutInline {SPAN} at (0,0) size 152x26 [bgcolor=#800080]
LayoutText {#text} at (0,69) size 152x26
text run at (0,69) width 152: "purple bg: \x{D83D}\x{DC11}\x{D83C}\x{DF72}"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment