Bug 1163878 (Followup) - Fix a warning about implicit conversion of nullptr to bool in FrameLayerBuilder on a CLOSED TREE. r=me
authorSeth Fowler <seth@mozilla.com>
Wed, 13 May 2015 14:23:52 -0700
changeset 243762 74f120732c626337c9bfde5f70e8202e06d976ae
parent 243761 e0231e8d2cdf4028163f409f0df97aaa2b85cb5f
child 243763 7ed1f7ecd6a2ce9b98c682c545035e676781b437
push id28753
push userkwierso@gmail.com
push dateThu, 14 May 2015 22:33:43 +0000
treeherdermozilla-central@07e2e15703cb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1163878
milestone41.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 1163878 (Followup) - Fix a warning about implicit conversion of nullptr to bool in FrameLayerBuilder on a CLOSED TREE. r=me
layout/base/FrameLayerBuilder.cpp
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2370,17 +2370,17 @@ PaintedLayerData::UpdateCommonClipCount(
     mCommonClipCount = aCurrentClip.GetRoundedRectCount();
   }
 }
 
 bool
 PaintedLayerData::CanOptimizeToImageLayer(nsDisplayListBuilder* aBuilder)
 {
   if (!mImage) {
-    return nullptr;
+    return false;
   }
 
   return mImage->CanOptimizeToImageLayer(mLayer->Manager(), aBuilder);
 }
 
 already_AddRefed<ImageContainer>
 PaintedLayerData::GetContainerForImageLayer(nsDisplayListBuilder* aBuilder)
 {