Bug 1197650 - Remove duplicate validity check for newly created fonts. r=m_kato, a=ritu
authorJohn Daggett <jdaggett@mozilla.com>
Tue, 25 Aug 2015 09:10:17 +0900
changeset 288922 b46868d2fe6237dbf18f6e94126c170f074bfb94
parent 288921 d98f8e8309ec573c6e34e0db98d4010be96e6cea
child 288923 e0f3c1fde8c84af06aa2f158959cb721e7092856
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersm_kato, ritu
bugs1197650
milestone42.0a2
Bug 1197650 - Remove duplicate validity check for newly created fonts. r=m_kato, a=ritu
gfx/thebes/gfxTextRun.cpp
--- a/gfx/thebes/gfxTextRun.cpp
+++ b/gfx/thebes/gfxTextRun.cpp
@@ -2647,19 +2647,16 @@ gfxFontGroup::FindNonItalicFaceForChar(g
     gfxFontEntry *fe = aFamily->FindFontForStyle(regularStyle, needsBold);
     NS_ASSERTION(!fe->mIsUserFontContainer,
                  "should only be searching platform fonts");
     if (!fe->HasCharacter(aCh)) {
         return nullptr;
     }
 
     nsRefPtr<gfxFont> font = fe->FindOrMakeFont(&mStyle, needsBold);
-    if (!font->Valid()) {
-        return nullptr;
-    }
     return font.forget();
 }
 
 gfxFloat
 gfxFontGroup::GetUnderlineOffset()
 {
     if (mUnderlineOffset == UNDERLINE_OFFSET_NOT_SET) {
         // if the fontlist contains a bad underline font, make the underline