no bug - fix nullptr to bool conversion in FontFaceSet.cpp r=themaid
authorTrevor Saunders <trev.saunders@gmail.com>
Sat, 04 Oct 2014 11:06:21 -0400
changeset 208827 85dc7c0f9f7105a2e6f5501da08568c72cb6663e
parent 208826 2374287a24ab3d60373eea2d4349c5b8129be182
child 208828 fa8375efaefcbba76647dbf35f771055ad0749c3
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersthemaid
milestone35.0a1
no bug - fix nullptr to bool conversion in FontFaceSet.cpp r=themaid
layout/style/FontFaceSet.cpp
--- a/layout/style/FontFaceSet.cpp
+++ b/layout/style/FontFaceSet.cpp
@@ -275,17 +275,17 @@ FontFaceSet::Clear()
 
 bool
 FontFaceSet::Delete(FontFace& aFontFace, ErrorResult& aRv)
 {
   mPresContext->FlushUserFontSet();
 
   if (aFontFace.HasRule()) {
     aRv.Throw(NS_ERROR_DOM_INVALID_MODIFICATION_ERR);
-    return nullptr;
+    return false;
   }
 
   if (!mNonRuleFaces.RemoveElement(&aFontFace)) {
     return false;
   }
 
   aFontFace.SetIsInFontFaceSet(false);