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 232042 85dc7c0f9f7105a2e6f5501da08568c72cb6663e
parent 232041 2374287a24ab3d60373eea2d4349c5b8129be182
child 232043 fa8375efaefcbba76647dbf35f771055ad0749c3
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersthemaid
milestone35.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
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);