Modified: branches/safari-601-branch/LayoutTests/ChangeLog (195748 => 195749)
--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-01-28 17:59:54 UTC (rev 195748)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-01-28 17:59:58 UTC (rev 195749)
@@ -1,5 +1,18 @@
2016-01-28 Matthew Hanson <matthew_han...@apple.com>
+ Merge r193931. rdar://problem/24190799
+
+ 2015-12-10 Ryan Haddad <ryanhad...@apple.com>
+
+ Rebaselining fast/text/emoji.html for Yosemite.
+ https://bugs.webkit.org/show_bug.cgi?id=152147
+
+ Unreviewed test gardening.
+
+ * platform/mac-yosemite/fast/text/emoji-expected.txt: Added.
+
+2016-01-28 Matthew Hanson <matthew_han...@apple.com>
+
Merge r194237. rdar://problem/24268438
2015-12-17 Zalan Bujtas <za...@apple.com>
Added: branches/safari-601-branch/LayoutTests/platform/mac-yosemite/fast/text/emoji-expected.txt (0 => 195749)
--- branches/safari-601-branch/LayoutTests/platform/mac-yosemite/fast/text/emoji-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/platform/mac-yosemite/fast/text/emoji-expected.txt 2016-01-28 17:59:58 UTC (rev 195749)
@@ -0,0 +1,27 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+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 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,57) size 784x420
+ RenderText {#text} at (0,6) size 477x74
+ text run at (0,6) width 477: "\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 (476,64) size 1x0
+ 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}"
