Bug 1323157 - Rename HasNoFilterOrHasValidFilter as HasNoOrValidFilter. r=longsonr+218550

MozReview-Commit-ID: GQzPf9Qy8LJ

--HG--
extra : rebase_source : d03d5609a8ed2eddaf596a019775a35bfd7d2f24

layout/painting/nsDisplayList.cpp

@@ -7528,11 +7528,16 @@ nsDisplayFilter::BuildLayer(nsDisplayListBuilder* aBuilder,
   nsSVGEffects::EffectProperties effectProperties =
     nsSVGEffects::GetEffectProperties(firstFrame);
 
-  ContainerLayerParameters newContainerParameters = aContainerParameters;
-  if (effectProperties.HasValidFilter()) {
-    newContainerParameters.mDisableSubpixelAntialiasingInDescendants = true;
+  if (effectProperties.HasInvalidFilter()) {
+    return nullptr;
   }
 
+  MOZ_ASSERT(effectProperties.mFilter && mFrame->StyleEffects()->HasFilters(),
+             "By getting here, we must have valid CSS filters.");
+
+  ContainerLayerParameters newContainerParameters = aContainerParameters;
+  newContainerParameters.mDisableSubpixelAntialiasingInDescendants = true;
+
   RefPtr<ContainerLayer> container = aManager->GetLayerBuilder()->
     BuildContainerLayerFor(aBuilder, aManager, mFrame, this, &mList,
                            newContainerParameters, nullptr);

layout/svg/nsSVGEffects.cpp

@@ -669,8 +669,7 @@ nsSVGEffects::EffectProperties::GetMaskFrames()
 bool
 nsSVGEffects::EffectProperties::HasNoOrValidEffects()
 {
-  return HasNoOrValidClipPath() && HasNoOrValidMask() &&
-         HasNoFilterOrHasValidFilter();
+  return HasNoOrValidClipPath() && HasNoOrValidMask() && HasNoOrValidFilter();
 }
 
 bool

layout/svg/nsSVGEffects.h

@@ -528,9 +528,20 @@ public:
       return mFilter && mFilter->ReferencesValidResources();
     }
 
-    bool HasNoFilterOrHasValidFilter() {
+    /*
+     * @return true if we either do not have filter or all filters we have
+     * are valid.
+     */
+    bool HasNoOrValidFilter() {
       return !mFilter || mFilter->ReferencesValidResources();
     }
+
+    /*
+     * @return true if we have an invalid filter.
+     */
+    bool HasInvalidFilter() {
+      return !HasNoOrValidFilter();
+    }
   };
 
   /**

layout/svg/nsSVGIntegrationUtils.cpp

@@ -1039,7 +1039,7 @@ nsSVGIntegrationUtils::PaintFilter(const PaintFramesParams& aParams)
   nsSVGEffects::EffectProperties effectProperties =
     nsSVGEffects::GetEffectProperties(firstFrame);
 
-  if (!effectProperties.HasValidFilter()) {
+  if (effectProperties.HasInvalidFilter()) {
     return DrawResult::NOT_READY;
   }