bug 703411 - remove redundant 'status' variable in gfxUserFontSet::OnLoadComplete. r=jdaggett
authorJonathan Kew <jfkthame@gmail.com>
Mon, 21 Nov 2011 08:19:57 +0000
changeset 80543 909ff89ee4877499cb859866a3a179458362c89c
parent 80542 ce874976149f46aa38985737f3749bf4f25d1c43
child 80544 0c4d3b7be17e12c03984b859c8bffc90dde1a83e
push id3494
push userjkew@mozilla.com
push dateMon, 21 Nov 2011 08:29:11 +0000
treeherdermozilla-inbound@909ff89ee487 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdaggett
bugs703411
milestone11.0a1
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
bug 703411 - remove redundant 'status' variable in gfxUserFontSet::OnLoadComplete. r=jdaggett
gfx/thebes/gfxUserFontSet.cpp
--- a/gfx/thebes/gfxUserFontSet.cpp
+++ b/gfx/thebes/gfxUserFontSet.cpp
@@ -574,21 +574,20 @@ gfxUserFontSet::OnLoadComplete(gfxProxyF
                    aDownloadStatus);
     }
 
     if (aFontData) {
         NS_Free((void*)aFontData);
     }
 
     // error occurred, load next src
-    LoadStatus status;
+    (void)LoadNext(aProxy);
 
-    status = LoadNext(aProxy);
-
-    // Even if loading failed, we need to bump the font-set generation
+    // We ignore the status returned by LoadNext();
+    // even if loading failed, we need to bump the font-set generation
     // and return true in order to trigger reflow, so that fallback
     // will be used where the text was "masked" by the pending download
     IncrementGeneration();
     return true;
 }
 
 
 gfxUserFontSet::LoadStatus