Bug 1358240 - Replace EmojiOne with Twemoji, r=jfkthame, timdream

--HG--
extra : rebase_source : cb1d370dc4fbff33f6022acf393126e0965089de

browser/fonts/README.txt

@@ -1,9 +1,9 @@
-EmojiOne Mozilla
+Twemoji Mozilla
 ================
 
-The upstream repository of EmojiOne Mozilla can be found at
+The upstream repository of Twemoji Mozilla can be found at
 
-  https://github.com/mozilla/emojione-colr
+  https://github.com/mozilla/twemoji-colr
 
 Please refer commit history for the current version of the font.
 This file purposely omit the version, so there is no need to update it here.

browser/fonts/moz.build

@@ -7,5 +7,5 @@
 if CONFIG['OS_ARCH'] in ('WINNT', 'Linux'):
     DIST_SUBDIR = ''
     FINAL_TARGET_FILES.fonts += [
-        'EmojiOneMozilla.ttf'
+        'TwemojiMozilla.ttf'
     ]

gfx/thebes/gfxPlatformGtk.cpp

@@ -193,10 +193,10 @@ gfxPlatformGtk::UpdateFontList()
 // out a more general list
 static const char kFontDejaVuSans[] = "DejaVu Sans";
 static const char kFontDejaVuSerif[] = "DejaVu Serif";
-static const char kFontEmojiOneMozilla[] = "EmojiOne Mozilla";
 static const char kFontFreeSans[] = "FreeSans";
 static const char kFontFreeSerif[] = "FreeSerif";
 static const char kFontTakaoPGothic[] = "TakaoPGothic";
+static const char kFontTwemojiMozilla[] = "Twemoji Mozilla";
 static const char kFontDroidSansFallback[] = "Droid Sans Fallback";
 static const char kFontWenQuanYiMicroHei[] = "WenQuanYi Micro Hei";
 static const char kFontNanumGothic[] = "NanumGothic";
@@ -212,7 +212,7 @@ gfxPlatformGtk::GetCommonFallbackFonts(uint32_t aCh, uint32_t aNextCh,
            (aNextCh != kVariationSelector15 &&
             emoji == EmojiPresentation::EmojiDefault)) {
             // if char is followed by VS16, try for a color emoji glyph
-            aFontList.AppendElement(kFontEmojiOneMozilla);
+            aFontList.AppendElement(kFontTwemojiMozilla);
         }
     }
 

gfx/thebes/gfxWindowsPlatform.cpp

@@ -627,7 +627,6 @@ static const char kFontCambriaMath[] = "Cambria Math";
 static const char kFontEbrima[] = "Ebrima";
 static const char kFontEstrangeloEdessa[] = "Estrangelo Edessa";
 static const char kFontEuphemia[] = "Euphemia";
-static const char kFontEmojiOneMozilla[] = "EmojiOne Mozilla";
 static const char kFontGabriola[] = "Gabriola";
 static const char kFontJavaneseText[] = "Javanese Text";
 static const char kFontKhmerUI[] = "Khmer UI";
@@ -654,6 +653,7 @@ static const char kFontSegoeUIEmoji[] = "Segoe UI Emoji";
 static const char kFontSegoeUISymbol[] = "Segoe UI Symbol";
 static const char kFontSylfaen[] = "Sylfaen";
 static const char kFontTraditionalArabic[] = "Traditional Arabic";
+static const char kFontTwemojiMozilla[] = "Twemoji Mozilla";
 static const char kFontUtsaah[] = "Utsaah";
 static const char kFontYuGothic[] = "Yu Gothic";
 
@@ -669,7 +669,7 @@ gfxWindowsPlatform::GetCommonFallbackFonts(uint32_t aCh, uint32_t aNextCh,
             emoji == EmojiPresentation::EmojiDefault)) {
             // if char is followed by VS16, try for a color emoji glyph
             aFontList.AppendElement(kFontSegoeUIEmoji);
-            aFontList.AppendElement(kFontEmojiOneMozilla);
+            aFontList.AppendElement(kFontTwemojiMozilla);
         }
     }
 

layout/reftests/font-matching/emoji-fallback-1-ref.html

@@ -5,7 +5,7 @@
 <title>emoji fallback</title>
 <style>
 #test {
-  font-family: 'Segoe UI Emoji', 'Apple Color Emoji', 'Noto Color Emoji', 'EmojiOne Mozilla';
+  font-family: 'Segoe UI Emoji', 'Apple Color Emoji', 'Noto Color Emoji', 'Twemoji Mozilla';
   font-size: 24pt;
 }
 </style>

layout/reftests/font-matching/emoji-fallback-3-ref.html

@@ -5,7 +5,7 @@
 <title>emoji fallback to color font</title>
 <style>
 #test {
-  font-family: 'Segoe UI Emoji', 'Apple Color Emoji', 'Noto Color Emoji', 'EmojiOne Mozilla';
+  font-family: 'Segoe UI Emoji', 'Apple Color Emoji', 'Noto Color Emoji', 'Twemoji Mozilla';
   font-size: 24pt;
 }
 </style>

layout/reftests/text/color-opacity-rtl-1-ref.html

@@ -5,7 +5,7 @@
 <title>Mozilla bug 1318539</title>
 <style>
 .ref {
-  font-family: EmojiOne Mozilla, Apple Color Emoji, Segoe UI Emoji, Noto Color Emoji, sans-serif;
+  font-family: Twemoji Mozilla, Apple Color Emoji, Segoe UI Emoji, Noto Color Emoji, sans-serif;
   font-size: 48px;
   opacity: 0.5;
   text-align: right;

layout/reftests/text/color-opacity-rtl-1.html

@@ -5,7 +5,7 @@
 <title>Mozilla bug 1318539</title>
 <style>
 .test {
-  font-family: EmojiOne Mozilla, Apple Color Emoji, Segoe UI Emoji, Noto Color Emoji, sans-serif;
+  font-family: Twemoji Mozilla, Apple Color Emoji, Segoe UI Emoji, Noto Color Emoji, sans-serif;
   font-size: 48px;
   opacity: 0.5;
 }

layout/reftests/text/color-opacity-rtl-2-ref.html

@@ -5,7 +5,7 @@
 <title>Mozilla bug 1318539</title>
 <style>
 .ref {
-  font-family: EmojiOne Mozilla, Apple Color Emoji, Segoe UI Emoji, Noto Color Emoji, sans-serif;
+  font-family: Twemoji Mozilla, Apple Color Emoji, Segoe UI Emoji, Noto Color Emoji, sans-serif;
   font-size: 48px;
   opacity: 0.5;
   unicode-bidi: bidi-override;

layout/reftests/text/color-opacity-rtl-2.html

@@ -5,7 +5,7 @@
 <title>Mozilla bug 1318539</title>
 <style>
 .test {
-  font-family: EmojiOne Mozilla, Apple Color Emoji, Segoe UI Emoji, Noto Color Emoji, sans-serif;
+  font-family: Twemoji Mozilla, Apple Color Emoji, Segoe UI Emoji, Noto Color Emoji, sans-serif;
   font-size: 48px;
   opacity: 0.5;
 }

layout/reftests/text/reftest.list

@@ -196,7 +196,7 @@ skip-if(!cocoaWidget) != 1349308-1.html 1349308-notref.html # macOS-specific tes
 == emoji-03.html emoji-03-ref.html
 # the next two will fail on OS X 10.6 because no color emoji font is present,
 # and also on Android platforms until we have color emoji fonts there.
-# Tests rely on bundled EmojiOne Mozilla to pass on Windows <8.1 and Linux.
+# Tests rely on bundled Twemoji Mozilla to pass on Windows <8.1 and Linux.
 fails-if(Android) != emoji-03.html emoji-03-notref.html
 fails-if(Android) == emoji-04.html emoji-04-ref.html
 != emoji-05.html emoji-05-notref.html

modules/libpref/init/all.js

@@ -3717,7 +3717,7 @@ pref("ui.mouse.radius.inputSource.touchOnly", true);
 
 #ifdef XP_WIN
 
-pref("font.name-list.emoji", "Segoe UI Emoji, EmojiOne Mozilla");
+pref("font.name-list.emoji", "Segoe UI Emoji, Twemoji Mozilla");
 
 pref("font.name-list.serif.ar", "Times New Roman");
 pref("font.name-list.sans-serif.ar", "Segoe UI, Tahoma, Arial");
@@ -4387,7 +4387,7 @@ pref("print.print_in_color", true);
 
 // fontconfig doesn't support emoji yet
 // https://lists.freedesktop.org/archives/fontconfig/2016-October/005842.html
-pref("font.name-list.emoji", "EmojiOne Mozilla");
+pref("font.name-list.emoji", "Twemoji Mozilla");
 
 pref("font.name-list.serif.ar", "serif");
 pref("font.name-list.sans-serif.ar", "sans-serif");

toolkit/content/license.html

@@ -87,7 +87,7 @@
       <li><a href="about:license#fuzz-aldrin">fuzz-aldrin License</a></li>
       <li><a href="about:license#hunspell-nl">Dutch Spellchecking Dictionary License</a></li>
 #if defined(XP_WIN) || defined(XP_LINUX)
-      <li><a href="about:license#emojione">EmojiOne License</a></li>
+      <li><a href="about:license#twemoji">Twemoji License</a></li>
 #endif
       <li><a href="about:license#hunspell-ee">Estonian Spellchecking Dictionary License</a></li>
       <li><a href="about:license#expat">Expat License</a></li>
@@ -3150,14 +3150,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <hr>
 
 #if defined(XP_WIN) || defined(XP_LINUX)
-    <h1><a id="emojione"></a>EmojiOne License</h1>
+    <h1><a id="twemoji"></a>Twemoji License</h1>
 
     <p>This license applies to the emoji art contained within the bundled
 emoji font file.</p>
 
 <pre>
-Copyright (c) 2016 Ranks.com Inc.
-Copyright (c) 2014 Twitter, Inc and other contributors.
+Copyright (c) 2018 Twitter, Inc and other contributors.
 
 Creative Commons Attribution 4.0 International (CC BY 4.0)