Bug 790285 - avoid nullptr -> false conversions. r=ehsan.
authorRafael Ávila de Espíndola <respindola@mozilla.com>
Tue, 11 Sep 2012 14:00:37 -0400
changeset 106823 bca8c3de19823a17775e7d3100dc7651a8ab8109
parent 106822 de4ea396bce32de48e0423eb0c6b083fd083ad28
child 106824 8700c0c598028eec3b1585132f3f9de015b5041c
push id23448
push userryanvm@gmail.com
push dateWed, 12 Sep 2012 01:39:22 +0000
treeherdermozilla-central@6e78c3efd115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs790285
milestone18.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 790285 - avoid nullptr -> false conversions. r=ehsan.
content/smil/nsSMILSetAnimationFunction.cpp
content/xml/document/src/nsXMLDocument.cpp
netwerk/cookie/nsCookieService.cpp
--- a/content/smil/nsSMILSetAnimationFunction.cpp
+++ b/content/smil/nsSMILSetAnimationFunction.cpp
@@ -83,17 +83,17 @@ nsSMILSetAnimationFunction::GetAttr(nsIA
   return nsSMILAnimationFunction::GetAttr(aAttName);
 }
 
 bool
 nsSMILSetAnimationFunction::GetAttr(nsIAtom* aAttName,
                                     nsAString& aResult) const
 {
   if (IsDisallowedAttribute(aAttName))
-    return nullptr;
+    return false;
 
   return nsSMILAnimationFunction::GetAttr(aAttName, aResult);
 }
 
 bool
 nsSMILSetAnimationFunction::WillReplace() const
 {
   return true;
--- a/content/xml/document/src/nsXMLDocument.cpp
+++ b/content/xml/document/src/nsXMLDocument.cpp
@@ -257,17 +257,17 @@ nsXMLDocument::Reset(nsIChannel* aChanne
 
 void
 nsXMLDocument::ResetToURI(nsIURI *aURI, nsILoadGroup *aLoadGroup,
                           nsIPrincipal* aPrincipal)
 {
   if (mChannelIsPending) {
     StopDocumentLoad();
     mChannel->Cancel(NS_BINDING_ABORTED);
-    mChannelIsPending = nullptr;
+    mChannelIsPending = false;
   }
 
   nsDocument::ResetToURI(aURI, aLoadGroup, aPrincipal);
 }
 
 NS_IMETHODIMP
 nsXMLDocument::GetAsync(bool *aAsync)
 {
--- a/netwerk/cookie/nsCookieService.cpp
+++ b/netwerk/cookie/nsCookieService.cpp
@@ -2482,17 +2482,17 @@ nsCookieService::GetCookieStringInternal
       } else {
         // just write value
         aCookieString += cookie->Value();
       }
     }
   }
 
   if (!aCookieString.IsEmpty())
-    COOKIE_LOGSUCCESS(GET_COOKIE, aHostURI, aCookieString, nullptr, nullptr);
+    COOKIE_LOGSUCCESS(GET_COOKIE, aHostURI, aCookieString, nullptr, false);
 }
 
 // processes a single cookie, and returns true if there are more cookies
 // to be processed
 bool
 nsCookieService::SetCookieInternal(nsIURI                        *aHostURI,
                                    const nsCString               &aBaseDomain,
                                    bool                           aRequireHostMatch,