Backed out changeset 66b8ea362db8 (bug 1304699) for build bustage
authorPhil Ringnalda <philringnalda@gmail.com>
Mon, 26 Sep 2016 18:37:13 -0700
changeset 315309 b0bc3eb907aecc98f6a5d2e9bd02d6535b0a2b00
parent 315308 2c645653db8c1b4c314ac34f6ed16adc80f0b2da
child 315310 a8c06ff713115293cdd3166be5ad0481a7957a9e
push id30747
push usercbook@mozilla.com
push dateTue, 27 Sep 2016 09:22:00 +0000
treeherdermozilla-central@66a77b9bfe5d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1304699
milestone52.0a1
backs out66b8ea362db884bd5d74937cf294395fc436999a
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 66b8ea362db8 (bug 1304699) for build bustage CLOSED TREE
gfx/thebes/gfxFont.cpp
gfx/thebes/gfxFont.h
gfx/thebes/gfxFontEntry.cpp
--- a/gfx/thebes/gfxFont.cpp
+++ b/gfx/thebes/gfxFont.cpp
@@ -3100,20 +3100,16 @@ gfxFont::InitFakeSmallCapsRun(DrawTarget
                               uint16_t        aOrientation,
                               Script          aScript,
                               bool            aSyntheticLower,
                               bool            aSyntheticUpper)
 {
     bool ok = true;
 
     RefPtr<gfxFont> smallCapsFont = GetSmallCapsFont();
-    if (!smallCapsFont) {
-        NS_WARNING("failed to get reduced-size font for smallcaps!");
-        smallCapsFont = this;
-    }
 
     enum RunCaseAction {
         kNoChange,
         kUppercaseReduce,
         kUppercase
     };
 
     RunCaseAction runAction = kNoChange;
--- a/gfx/thebes/gfxFont.h
+++ b/gfx/thebes/gfxFont.h
@@ -298,17 +298,17 @@ public:
     // It's OK to call this even if Init() has not been called.
     static void Shutdown();
 
     // Look up a font in the cache. Returns an addrefed pointer, or null
     // if there's nothing matching in the cache
     already_AddRefed<gfxFont>
     Lookup(const gfxFontEntry* aFontEntry,
            const gfxFontStyle* aStyle,
-           const gfxCharacterMap* aUnicodeRangeMap);
+           const gfxCharacterMap* aUnicodeRangeMap = nullptr);
 
     // We created a new font (presumably because Lookup returned null);
     // put it in the cache. The font's refcount should be nonzero. It is
     // allowable to add a new font even if there is one already in the
     // cache with the same key; we'll forget about the old one.
     void AddNew(gfxFont *aFont);
 
     // The font's refcount has gone to zero; give ownership of it to
--- a/gfx/thebes/gfxFontEntry.cpp
+++ b/gfx/thebes/gfxFontEntry.cpp
@@ -275,18 +275,17 @@ gfxFontEntry::RealFaceName()
 }
 
 already_AddRefed<gfxFont>
 gfxFontEntry::FindOrMakeFont(const gfxFontStyle *aStyle,
                              bool aNeedsBold,
                              gfxCharacterMap* aUnicodeRangeMap)
 {
     // the font entry name is the psname, not the family name
-    RefPtr<gfxFont> font =
-        gfxFontCache::GetCache()->Lookup(this, aStyle, aUnicodeRangeMap);
+    RefPtr<gfxFont> font = gfxFontCache::GetCache()->Lookup(this, aStyle);
 
     if (!font) {
         gfxFont *newFont = CreateFontInstance(aStyle, aNeedsBold);
         if (!newFont)
             return nullptr;
         if (!newFont->Valid()) {
             delete newFont;
             return nullptr;