Skip to site navigation (Press enter)

[webkit-changes] [193967] branches/safari-601-branch

matthew_hanson Fri, 11 Dec 2015 10:28:46 -0800

Title: [193967] branches/safari-601-branch

Revision: 193967
Author: matthew_han...@apple.com
Date: 2015-12-11 10:26:41 -0800 (Fri, 11 Dec 2015)

Log Message

Merge r193922. rdar://problem/23727472


Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/LayoutTests/fast/text/emoji.html
branches/safari-601-branch/LayoutTests/platform/mac/fast/text/emoji-expected.txt
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/platform/text/TextBreakIterator.cpp

Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193966 => 193967)


--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-11 18:26:38 UTC (rev 193966)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-11 18:26:41 UTC (rev 193967)
@@ -1,5 +1,21 @@
 2015-12-11  Matthew Hanson  <matthew_han...@apple.com>
 
+        Merge r193922. rdar://problem/23727472
+
+    2015-12-10  Enrica Casucci  <enr...@apple.com>
+
+            Change skin tone support for two emoji.
+            https://bugs.webkit.org/show_bug.cgi?id=152147
+            rdar://problem/23716993
+            rdar://problem/23716344
+
+            Reviewed by Darin Adler.
+
+            * fast/text/emoji.html:
+            * platform/mac/fast/text/emoji-expected.txt:
+
+2015-12-11  Matthew Hanson  <matthew_han...@apple.com>
+
         Merge r193859. rdar://problem/23814477
 
     2015-12-09  David Hyatt  <hy...@apple.com>

Modified: branches/safari-601-branch/LayoutTests/fast/text/emoji.html (193966 => 193967)


--- branches/safari-601-branch/LayoutTests/fast/text/emoji.html	2015-12-11 18:26:38 UTC (rev 193966)
+++ branches/safari-601-branch/LayoutTests/fast/text/emoji.html	2015-12-11 18:26:41 UTC (rev 193967)
@@ -1,9 +1,9 @@
 <html>
 <body>
-    This test validate rendering of emoji sequences and emoji with modifiers.
+    This test validate rendering of emoji sequences and emoji with modifiers. Horse racing emoji no longer supports skin tone. Added skin tone to spy.
 <div style="font-family: 'Apple Color Emoji';">&#x1f601;</div>
-<div style='font-size: 36px'>
-&#x1F466;&#x1F3FB;&#x1F469;&#x1F3FC;&#x1F466;&#x1F3FE;&#x2764;&#xFE0F;&#x1F48B;<br>
+<div style='font-size: 64px'>
+&#x1F466;&#x1F3FB;&#x1F469;&#x1F3FC;&#x1F466;&#x1F3FE;&#x2764;&#xFE0F;&#x1F48B;&#x1F575;&#x1F3FB;&#x1F3C7;&#x1F3FB;<br>
 &#x1F468;&#x200D;&#x1F469;&#x200D;&#x1F466; &#x1F468;&#x200D;&#x1F469;&#x200D;&#x1F467; &#x1F46A; &#x1F466;&#x1F3FB;&#x1F469;&#x1F3FC;&#x1F466;&#x1F3FE;<br>
 &#x1F469;&#x200D;&#x1F469;&#x200D;&#x1F466; &#x1F469;&#x200D;&#x1F469;&#x200D;&#x1F467; &#x1F469;&#x200D;&#x1F469;&#x200D;&#x1F467;&#x200D;&#x1F466; &#x1F469;&#x200D;&#x1F469;&#x200D;&#x1F466;&#x200D;&#x1F466; &#x1F469;&#x200D;&#x1F469;&#x200D;&#x1F467;&#x200D;&#x1F467;<br>
 &#x1F468;&#x200D;&#x1F468;&#x200D;&#x1F466; &#x1F468;&#x200D;&#x1F468;&#x200D;&#x1F467; &#x1F468;&#x200D;&#x1F468;&#x200D;&#x1F467;&#x200D;&#x1F466; &#x1F468;&#x200D;&#x1F468;&#x200D;&#x1F466;&#x200D;&#x1F466; &#x1F468;&#x200D;&#x1F468;&#x200D;&#x1F467;&#x200D;&#x1F467;<br>

Modified: branches/safari-601-branch/LayoutTests/platform/mac/fast/text/emoji-expected.txt (193966 => 193967)


--- branches/safari-601-branch/LayoutTests/platform/mac/fast/text/emoji-expected.txt	2015-12-11 18:26:38 UTC (rev 193966)
+++ branches/safari-601-branch/LayoutTests/platform/mac/fast/text/emoji-expected.txt	2015-12-11 18:26:41 UTC (rev 193967)
@@ -3,24 +3,25 @@
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock (anonymous) at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 470x18
-          text run at (0,0) width 470: "This test validate rendering of emoji sequences and emoji with modifiers."
-      RenderBlock {DIV} at (0,18) size 784x21
+      RenderBlock (anonymous) at (0,0) size 784x36
+        RenderText {#text} at (0,0) size 751x36
+          text run at (0,0) width 751: "This test validate rendering of emoji sequences and emoji with modifiers. Horse racing emoji no longer supports skin"
+          text run at (0,18) width 187: "tone. Added skin tone to spy."
+      RenderBlock {DIV} at (0,36) size 784x21
         RenderText {#text} at (0,0) size 21x21
           text run at (0,0) width 21: "\x{D83D}\x{DE01}"
-      RenderBlock {DIV} at (0,39) size 784x235
-        RenderText {#text} at (0,4) size 180x41
-          text run at (0,4) width 180: "\x{D83D}\x{DC66}\x{D83C}\x{DFFB}\x{D83D}\x{DC69}\x{D83C}\x{DFFC}\x{D83D}\x{DC66}\x{D83C}\x{DFFE}\x{2764}\x{FE0F}\x{D83D}\x{DC8B}"
-        RenderBR {BR} at (180,36) size 0x0
-        RenderText {#text} at (0,51) size 243x41
-          text run at (0,51) width 243: "\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC67} \x{D83D}\x{DC6A} \x{D83D}\x{DC66}\x{D83C}\x{DFFB}\x{D83D}\x{DC69}\x{D83C}\x{DFFC}\x{D83D}\x{DC66}\x{D83C}\x{DFFE}"
-        RenderBR {BR} at (243,83) size 0x0
-        RenderText {#text} at (0,98) size 216x41
-          text run at (0,98) width 216: "\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC67} \x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC67}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC66}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC67}\x{200D}\x{D83D}\x{DC67}"
-        RenderBR {BR} at (216,130) size 0x0
-        RenderText {#text} at (0,145) size 216x41
-          text run at (0,145) width 216: "\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC67} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC67}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC66}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC67}\x{200D}\x{D83D}\x{DC67}"
-        RenderBR {BR} at (216,177) size 0x0
-        RenderText {#text} at (0,192) size 216x41
-          text run at (0,192) width 216: "\x{D83D}\x{DC69}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC69} \x{D83D}\x{DC68}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC68} \x{D83D}\x{DC69}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC8B}\x{200D}\x{D83D}\x{DC69} \x{D83D}\x{DC68}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC8B}\x{200D}\x{D83D}\x{DC68} \x{D83D}\x{DC69}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC69}"
+      RenderBlock {DIV} at (0,57) size 784x420
+        RenderText {#text} at (0,6) size 512x74
+          text run at (0,6) width 512: "\x{D83D}\x{DC66}\x{D83C}\x{DFFB}\x{D83D}\x{DC69}\x{D83C}\x{DFFC}\x{D83D}\x{DC66}\x{D83C}\x{DFFE}\x{2764}\x{FE0F}\x{D83D}\x{DC8B}\x{D83D}\x{DD75}\x{D83C}\x{DFFB}\x{D83C}\x{DFC7}\x{D83C}\x{DFFB}"
+        RenderBR {BR} at (512,64) size 0x0
+        RenderText {#text} at (0,90) size 432x74
+          text run at (0,90) width 432: "\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC67} \x{D83D}\x{DC6A} \x{D83D}\x{DC66}\x{D83C}\x{DFFB}\x{D83D}\x{DC69}\x{D83C}\x{DFFC}\x{D83D}\x{DC66}\x{D83C}\x{DFFE}"
+        RenderBR {BR} at (432,148) size 0x0
+        RenderText {#text} at (0,174) size 384x74
+          text run at (0,174) width 384: "\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC67} \x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC67}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC66}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC67}\x{200D}\x{D83D}\x{DC67}"
+        RenderBR {BR} at (384,232) size 0x0
+        RenderText {#text} at (0,258) size 384x74
+          text run at (0,258) width 384: "\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC67} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC67}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC66}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC67}\x{200D}\x{D83D}\x{DC67}"
+        RenderBR {BR} at (384,316) size 0x0
+        RenderText {#text} at (0,342) size 384x74
+          text run at (0,342) width 384: "\x{D83D}\x{DC69}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC69} \x{D83D}\x{DC68}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC68} \x{D83D}\x{DC69}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC8B}\x{200D}\x{D83D}\x{DC69} \x{D83D}\x{DC68}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC8B}\x{200D}\x{D83D}\x{DC68} \x{D83D}\x{DC69}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC69}"

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193966 => 193967)


--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-11 18:26:38 UTC (rev 193966)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-11 18:26:41 UTC (rev 193967)
@@ -1,5 +1,24 @@
 2015-12-11  Matthew Hanson  <matthew_han...@apple.com>
 
+        Merge r193922. rdar://problem/23727472
+
+    2015-12-10  Enrica Casucci  <enr...@apple.com>
+
+            Change skin tone support for two emoji.
+            https://bugs.webkit.org/show_bug.cgi?id=152147
+            rdar://problem/23716993
+            rdar://problem/23716344
+
+            Reviewed by Darin Adler.
+
+            Horse race emoji (1F3C7) should no longer have skin tone variation.
+            Sleuth/Spy emoji (!F575) should instead have skin tone variation.
+
+            * platform/text/TextBreakIterator.cpp:
+            (WebCore::cursorMovementIterator):
+
+2015-12-11  Matthew Hanson  <matthew_han...@apple.com>
+
         Merge r193859. rdar://problem/23814477
 
     2015-12-09  David Hyatt  <hy...@apple.com>

Modified: branches/safari-601-branch/Source/WebCore/platform/text/TextBreakIterator.cpp (193966 => 193967)


--- branches/safari-601-branch/Source/WebCore/platform/text/TextBreakIterator.cpp	2015-12-11 18:26:38 UTC (rev 193966)
+++ branches/safari-601-branch/Source/WebCore/platform/text/TextBreakIterator.cpp	2015-12-11 18:26:41 UTC (rev 193967)
@@ -214,7 +214,7 @@
         "$EmojiVar = [\\uFE0F];"            // Emoji-style variation selector
 #if ADDITIONAL_EMOJI_SUPPORT
         "$EmojiForSeqs = [\\u2764 \\U0001F441 \\U0001F466-\\U0001F469 \\U0001F48B \\U0001F5E8];" // Emoji that participate in ZWJ sequences
-        "$EmojiForMods = [\\u261D \\u26F9 \\u270A-\\u270D \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F3CB \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F590 \\U0001F595 \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0 \\U0001F918] ;" // Emoji that take Fitzpatrick modifiers
+        "$EmojiForMods = [\\u261D \\u26F9 \\u270A-\\u270D \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3CA \\U0001F3CB \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F575 \\U0001F590 \\U0001F595 \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0 \\U0001F918] ;" // Emoji that take Fitzpatrick modifiers
 #else
         "$EmojiForSeqs = [\\u2764 \\U0001F466-\\U0001F469 \\U0001F48B];" // Emoji that participate in ZWJ sequences
         "$EmojiForMods = [\\u261D \\u270A-\\u270C \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0] ;" // Emoji that take Fitzpatrick modifiers
@@ -447,7 +447,7 @@
     "$EmojiVar = \\uFE0F;"
 #if ADDITIONAL_EMOJI_SUPPORT
     "$EmojiForSeqs = [\\u2764 \\U0001F441 \\U0001F466-\\U0001F469 \\U0001F48B \\U0001F5E8];"
-    "$EmojiForMods = [\\u261D \\u26F9 \\u270A-\\u270D \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F3CB \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F590 \\U0001F595 \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0 \\U0001F918] ;" // Emoji that take Fitzpatrick modifiers
+    "$EmojiForMods = [\\u261D \\u26F9 \\u270A-\\u270D \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3CA \\U0001F3CB \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F575 \\U0001F590 \\U0001F595 \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0 \\U0001F918] ;" // Emoji that take Fitzpatrick modifiers
 #else
     "$EmojiForSeqs = [\\u2764 \\U0001F466-\\U0001F469 \\U0001F48B];"
     "$EmojiForMods = [\\u261D \\u270A-\\u270C \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0] ;" // Emoji that take Fitzpatrick modifiers

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes