Backed out changeset 6ba1398db335 (bug 1231701) for causing valgrind failures
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 16 Jun 2016 18:31:16 +0100
changeset 301946 942a42c22de790ca091f1e329250ef11217636bc
parent 301945 ea9d62d5f09bbcafdd18290a01c07629e40d69b8
child 301947 05873df0c0c268e419a714b8a6204cb852049098
push id30345
push usercbook@mozilla.com
push dateThu, 16 Jun 2016 23:30:45 +0000
treeherdermozilla-central@05873df0c0c2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1231701
milestone50.0a1
backs out6ba1398db335a3175b08cb26ebb499544e30171a
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 6ba1398db335 (bug 1231701) for causing valgrind failures
browser/confvars.sh
browser/fonts/EmojiOneMozilla.ttf
browser/fonts/README.txt
browser/fonts/moz.build
browser/installer/package-manifest.in
browser/moz.build
gfx/thebes/gfxPlatformGtk.cpp
gfx/thebes/gfxWindowsPlatform.cpp
layout/reftests/text/reftest.list
toolkit/content/license.html
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -3,21 +3,16 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MOZ_APP_BASENAME=Firefox
 MOZ_APP_VENDOR=Mozilla
 MOZ_UPDATER=1
 MOZ_PHOENIX=1
 
-if test "$OS_ARCH" = "WINNT" -o \
-        "$OS_ARCH" = "Linux"; then
-  MOZ_BUNDLED_FONTS=1
-fi
-
 if test "$OS_ARCH" = "WINNT"; then
   MOZ_MAINTENANCE_SERVICE=1
   if ! test "$HAVE_64BIT_BUILD"; then
     if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \
             "$MOZ_UPDATE_CHANNEL" = "aurora" -o \
             "$MOZ_UPDATE_CHANNEL" = "beta" -o \
             "$MOZ_UPDATE_CHANNEL" = "beta-dev" -o \
             "$MOZ_UPDATE_CHANNEL" = "release" -o \
deleted file mode 100644
index 7f254a35051741699a44b79c3844d4227286182f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/browser/fonts/README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-EmojiOne Mozilla
-================
-
-The upstream repository of EmojiOne Mozilla can be found at
-
-  https://github.com/mozilla/emojione-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.
deleted file mode 100644
--- a/browser/fonts/moz.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-if CONFIG['OS_ARCH'] in ('WINNT', 'Linux'):
-    DIST_SUBDIR = ''
-    FINAL_TARGET_FILES.fonts += [
-        'EmojiOneMozilla.ttf'
-    ]
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -43,19 +43,16 @@
 #endif
 
 [@AB_CD@]
 @RESPATH@/browser/chrome/@AB_CD@@JAREXT@
 @RESPATH@/browser/chrome/@AB_CD@.manifest
 @RESPATH@/chrome/@AB_CD@@JAREXT@
 @RESPATH@/chrome/@AB_CD@.manifest
 @RESPATH@/dictionaries/*
-#if defined(XP_WIN) || defined(XP_LINUX)
-@RESPATH@/fonts/*
-#endif
 @RESPATH@/hyphenation/*
 @RESPATH@/browser/@PREF_DIR@/firefox-l10n.js
 #ifdef HAVE_MAKENSISU
 @BINPATH@/uninstall/helper.exe
 #endif
 #ifdef MOZ_UPDATER
 @RESPATH@/update.locale
 @RESPATH@/updater.ini
--- a/browser/moz.build
+++ b/browser/moz.build
@@ -7,17 +7,16 @@
 CONFIGURE_SUBST_FILES += ['installer/Makefile']
 
 SPHINX_TREES['browser'] = 'docs'
 
 DIRS += [
     'base',
     'components',
     'experiments',
-    'fonts',
     'locales',
     'modules',
     'themes',
     'extensions',
 ]
 
 DIRS += [
     'app',
--- a/gfx/thebes/gfxPlatformGtk.cpp
+++ b/gfx/thebes/gfxPlatformGtk.cpp
@@ -85,17 +85,17 @@ gfxPlatformGtk::gfxPlatformGtk()
     sUseFcFontList = mozilla::Preferences::GetBool("gfx.font_rendering.fontconfig.fontlist.enabled");
     if (!sUseFcFontList && !sFontconfigUtils) {
         sFontconfigUtils = gfxFontconfigUtils::GetFontconfigUtils();
     }
 
     mMaxGenericSubstitutions = UNINITIALIZED_VALUE;
 
 #ifdef MOZ_X11
-    sUseXRender = (GDK_IS_X11_DISPLAY(gdk_display_get_default())) ?
+    sUseXRender = (GDK_IS_X11_DISPLAY(gdk_display_get_default())) ? 
                     mozilla::Preferences::GetBool("gfx.xrender.enabled") : false;
 #endif
 
     uint32_t canvasMask = BackendTypeBit(BackendType::CAIRO) | BackendTypeBit(BackendType::SKIA);
     uint32_t contentMask = BackendTypeBit(BackendType::CAIRO) | BackendTypeBit(BackendType::SKIA);
     InitBackendPrefs(canvasMask, BackendType::CAIRO,
                      contentMask, BackendType::CAIRO);
 }
@@ -197,48 +197,33 @@ gfxPlatformGtk::UpdateFontList()
 
     return sFontconfigUtils->UpdateFontList();
 }
 
 // xxx - this is ubuntu centric, need to go through other distros and flesh
 // 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 kFontDroidSansFallback[] = "Droid Sans Fallback";
 static const char kFontWenQuanYiMicroHei[] = "WenQuanYi Micro Hei";
 static const char kFontNanumGothic[] = "NanumGothic";
 
 void
 gfxPlatformGtk::GetCommonFallbackFonts(uint32_t aCh, uint32_t aNextCh,
                                        Script aRunScript,
                                        nsTArray<const char*>& aFontList)
 {
-    if (aNextCh == 0xfe0fu) {
-      // if char is followed by VS16, try for a color emoji glyph
-      aFontList.AppendElement(kFontEmojiOneMozilla);
-    }
-
     aFontList.AppendElement(kFontDejaVuSerif);
     aFontList.AppendElement(kFontFreeSerif);
     aFontList.AppendElement(kFontDejaVuSans);
     aFontList.AppendElement(kFontFreeSans);
 
-    if (!IS_IN_BMP(aCh)) {
-        uint32_t p = aCh >> 16;
-        if (p == 1) { // try color emoji font, unless VS15 (text style) present
-            if (aNextCh != 0xfe0fu && aNextCh != 0xfe0eu) {
-                aFontList.AppendElement(kFontEmojiOneMozilla);
-            }
-        }
-    }
-
     // add fonts for CJK ranges
     // xxx - this isn't really correct, should use the same CJK font ordering
     // as the pref font code
     if (aCh >= 0x3000 &&
         ((aCh < 0xe000) ||
          (aCh >= 0xf900 && aCh < 0xfff0) ||
          ((aCh >> 16) == 2))) {
         aFontList.AppendElement(kFontTakaoPGothic);
@@ -298,17 +283,17 @@ gfxPlatformGtk::LookupLocalFont(const ns
         return pfl->LookupLocalFont(aFontName, aWeight, aStretch,
                                     aStyle);
     }
 
     return gfxPangoFontGroup::NewFontEntry(aFontName, aWeight,
                                            aStretch, aStyle);
 }
 
-gfxFontEntry*
+gfxFontEntry* 
 gfxPlatformGtk::MakePlatformFont(const nsAString& aFontName,
                                  uint16_t aWeight,
                                  int16_t aStretch,
                                  uint8_t aStyle,
                                  const uint8_t* aFontData,
                                  uint32_t aLength)
 {
     if (sUseFcFontList) {
@@ -447,17 +432,17 @@ gfxPlatformGtk::GetPlatformCMSOutputProf
 
     Atom edidAtom, iccAtom;
     Display *dpy = GDK_DISPLAY_XDISPLAY(display);
     // In xpcshell tests, we never initialize X and hence don't have a Display.
     // In this case, there's no output colour management to be done, so we just
     // return with nullptr.
     if (!dpy)
         return;
-
+ 
     Window root = gdk_x11_get_default_root_xwindow();
 
     Atom retAtom;
     int retFormat;
     unsigned long retLength, retAfter;
     unsigned char *retProperty ;
 
     iccAtom = XInternAtom(dpy, ICC_PROFILE_ATOM_NAME, TRUE);
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -649,17 +649,16 @@ static const char kFontAparajita[] = "Ap
 static const char kFontArabicTypesetting[] = "Arabic Typesetting";
 static const char kFontArial[] = "Arial";
 static const char kFontArialUnicodeMS[] = "Arial Unicode MS";
 static const char kFontCambria[] = "Cambria";
 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";
 static const char kFontLaoUI[] = "Lao UI";
 static const char kFontLeelawadeeUI[] = "Leelawadee UI";
 static const char kFontLucidaSansUnicode[] = "Lucida Sans Unicode";
 static const char kFontMVBoli[] = "MV Boli";
 static const char kFontMalgunGothic[] = "Malgun Gothic";
@@ -686,33 +685,30 @@ static const char kFontYuGothic[] = "Yu 
 
 void
 gfxWindowsPlatform::GetCommonFallbackFonts(uint32_t aCh, uint32_t aNextCh,
                                            Script aRunScript,
                                            nsTArray<const char*>& aFontList)
 {
     if (aNextCh == 0xfe0fu) {
         aFontList.AppendElement(kFontSegoeUIEmoji);
-        aFontList.AppendElement(kFontEmojiOneMozilla);
     }
 
     // Arial is used as the default fallback for system fallback
     aFontList.AppendElement(kFontArial);
 
     if (!IS_IN_BMP(aCh)) {
         uint32_t p = aCh >> 16;
         if (p == 1) { // SMP plane
             if (aNextCh == 0xfe0eu) {
                 aFontList.AppendElement(kFontSegoeUISymbol);
                 aFontList.AppendElement(kFontSegoeUIEmoji);
-                aFontList.AppendElement(kFontEmojiOneMozilla);
             } else {
                 if (aNextCh != 0xfe0fu) {
                     aFontList.AppendElement(kFontSegoeUIEmoji);
-                    aFontList.AppendElement(kFontEmojiOneMozilla);
                 }
                 aFontList.AppendElement(kFontSegoeUISymbol);
             }
             aFontList.AppendElement(kFontEbrima);
             aFontList.AppendElement(kFontNirmalaUI);
             aFontList.AppendElement(kFontCambriaMath);
         }
     } else {
--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@@ -186,21 +186,20 @@ HTTP(..) != 1170688.html 1170688-ref.htm
 
 # ensure emoji chars don't render blank (bug 715798, bug 779042);
 # should at least render hexboxes if there's no font support
 != emoji-01.html emoji-01-notref.html
 != emoji-02.html emoji-02-notref.html
 
 # Bug 727276: tests with variation selectors 15 and 16 to control emoji rendering style
 == 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/B2G platforms until we have color emoji fonts there.
-# Tests rely on bundled EmojiOne Mozilla to pass on Windows <8.1 and Linux.
-fails-if(OSX==1006||B2G||Android) != emoji-03.html emoji-03-notref.html
-fails-if(OSX==1006||B2G||Android) == emoji-04.html emoji-04-ref.html
+# the next two will fail on OS X 10.6 and on Windows prior to 8.1 because no color emoji font is present,
+# and also on Linux/Android/B2G platforms until we have color emoji fonts there
+fails-if(OSX==1006||/^Windows\x20NT\x20(5|6\.[0-2])/.test(http.oscpu)||gtkWidget||Android) != emoji-03.html emoji-03-notref.html
+fails-if(OSX==1006||/^Windows\x20NT\x20(5|6\.[0-2])/.test(http.oscpu)||gtkWidget||Android) == emoji-04.html emoji-04-ref.html
 != emoji-05.html emoji-05-notref.html
 
 # check that Graphite shaping (bug 631479) is working
 pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-01.html graphite-01-ref.html
 # Test 02 (using Pig Latin) is fuzzy on Win7 because glyph positioning is not guaranteed to match exactly
 # between a sequence of simple glyphs rendered individually, and the same sequence treated as a single cluster.
 fuzzy-if(winWidget,49,220) pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-02.html graphite-02-ref.html
 pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) != graphite-03a.html graphite-03-notref.html
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -83,19 +83,16 @@
       <li><a href="about:license#chromium">Chromium License</a></li>
       <li><a href="about:license#classnames">classnames License</a></li>
       <li><a href="about:license#codemirror">CodeMirror License</a></li>
       <li><a href="about:license#cubic-bezier">cubic-bezier License</a></li>
       <li><a href="about:license#d3">D3 License</a></li>
       <li><a href="about:license#dagre-d3">Dagre-D3 License</a></li>
       <li><a href="about:license#dtoa">dtoa 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>
-#endif
       <li><a href="about:license#hunspell-ee">Estonian Spellchecking Dictionary License</a></li>
       <li><a href="about:license#expat">Expat License</a></li>
       <li><a href="about:license#firebug">Firebug License</a></li>
       <li><a href="about:license#gfx-font-list">gfxFontList License</a></li>
       <li><a href="about:license#google-bsd">Google BSD License</a></li>
       <li><a href="about:license#gears">Google Gears License</a></li>
       <li><a href="about:license#gears-istumbler">Google Gears/iStumbler License</a></li>
       <li><a href="about:license#vp8">Google VP8 License</a></li>
@@ -2963,61 +2960,16 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEV
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
 
     <hr>
 
-#if defined(XP_WIN) || defined(XP_LINUX)
-    <h1><a id="emojione"></a>EmojiOne 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.
-
-Creative Commons Attribution 4.0 International (CC BY 4.0)
-
-See https://creativecommons.org/licenses/by/4.0/legalcode or
-for the human readable summary: https://creativecommons.org/licenses/by/4.0/
-
-You are free to:
-
-Share — copy and redistribute the material in any medium or format
-
-Adapt — remix, transform, and build upon the material for any purpose, even commercially.
-
-The licensor cannot revoke these freedoms as long as you follow the license terms.
-
-Under the following terms:
-
-Attribution — You must give appropriate credit, provide a link to the license,
-and indicate if changes were made. You may do so in any reasonable manner,
-but not in any way that suggests the licensor endorses you or your use.
-
-No additional restrictions — You may not apply legal terms or technological
-measures that legally restrict others from doing anything the license permits.
-
-Notices:
-
-You do not have to comply with the license for elements of the material in
-the public domain or where your use is permitted by an applicable exception or
-limitation. No warranties are given. The license may not give you all of the
-permissions necessary for your intended use. For example, other rights such as
-publicity, privacy, or moral rights may limit how you use the material.
-</pre>
-
-
-    <hr>
-
-#endif
     <h1><a id="hunspell-ee"></a>Estonian Spellchecking Dictionary License</h1>
 
     <p>This license applies to precursor works to certain files which are
       part of the Estonian Spellchecking Dictionary. The
       shipped versions are under the GNU Lesser General Public License. (This
       code only ships in some localized versions of this product.)</p>
 
 <pre>