Consolidate background fill layer opaqueness into one method

third_party/WebKit/Source/core/paint/BoxPainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/BoxPainter.h"
 
 #include "core/HTMLNames.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/layout/ImageQualityController.h"
@@ skipping 116 matching lines @@
 {
     if (m_layoutBox.isDocumentElement())
         return;
     if (m_layoutBox.backgroundStolenForBeingBody())
         return;
     if (m_layoutBox.boxDecorationBackgroundIsKnownToBeObscured())
         return;
     paintFillLayers(paintInfo, backgroundColor, m_layoutBox.style()->backgroundLayers(), paintRect, bleedAvoidance);
 }
 
-bool BoxPainter::isFillLayerOpaque(const FillLayer& layer, const LayoutObject& imageClient)
-{
-    // The default object size passed down to imageSize is empty with the implication that images
-    // with no intrinsic size are treated as empty.
-    return layer.hasOpaqueImage(&imageClient)
-        && layer.image()->canRender()
-        && !layer.image()->imageSize(imageClient, imageClient.style()->effectiveZoom(), LayoutSize()).isEmpty()
-        && layer.hasRepeatXY();
-}
-
 bool BoxPainter::calculateFillLayerOcclusionCulling(FillLayerOcclusionOutputList &reversedPaintList, const FillLayer& fillLayer)
 {
     bool isNonAssociative = false;
     for (auto currentLayer = &fillLayer; currentLayer; currentLayer = currentLayer->next()) {
         reversedPaintList.append(currentLayer);
         // Stop traversal when an opaque layer is encountered.
         // FIXME : It would be possible for the following occlusion culling test to be more aggressive
         // on layers with no repeat by testing whether the image covers the layout rect.
         // Testing that here would imply duplicating a lot of calculations that are currently done in
         // LayoutBoxModelObject::paintFillLayer. A more efficient solution might be to move the layer
         // recursion into paintFillLayer, or to compute the layer geometry here and pass it down.
 
         // TODO(trchen): Need to check compositing mode as well.
         if (currentLayer->blendMode() != WebBlendModeNormal)
             isNonAssociative = true;
 
         // TODO(trchen): A fill layer cannot paint if the calculated tile size is empty.
         // This occlusion check can be wrong.
         if (currentLayer->clipOccludesNextLayers()
-            && isFillLayerOpaque(*currentLayer, m_layoutBox)) {
+            && currentLayer->imageOccludesNextLayers(m_layoutBox)) {
             if (currentLayer->clip() == BorderFillBox)
                 isNonAssociative = false;
             break;
         }
     }
     return isNonAssociative;
 }
 
 void BoxPainter::paintFillLayers(const PaintInfo& paintInfo, const Color& c, const FillLayer& fillLayer, const LayoutRect& rect, BackgroundBleedAvoidance bleedAvoidance, SkXfermode::Mode op, const LayoutObject* backgroundObject)
 {
@@ skipping 249 matching lines @@
     if (bgImage)
         geometry.calculate(obj, paintInfo.paintContainer(), paintInfo.getGlobalPaintFlags(), bgLayer, scrolledPaintRect);
     bool shouldPaintBackgroundImage = bgImage && bgImage->canRender();
 
     // Paint the color first underneath all images, culled if background image occludes it.
     // TODO(trchen): In the !bgLayer.hasRepeatXY() case, we could improve the culling test
     // by verifying whether the background image covers the entire painting area.
     if (isBottomLayer) {
         IntRect backgroundRect(pixelSnappedIntRect(scrolledPaintRect));
         bool boxShadowShouldBeAppliedToBackground = obj.boxShadowShouldBeAppliedToBackground(bleedAvoidance, box);
-        bool backgroundImageOccludesBackgroundColor = shouldPaintBackgroundImage && isFillLayerOpaque(bgLayer, obj);
+        bool backgroundImageOccludesBackgroundColor = shouldPaintBackgroundImage && bgLayer.imageOccludesNextLayers(obj);
         if (boxShadowShouldBeAppliedToBackground || !backgroundImageOccludesBackgroundColor)  {
             GraphicsContextStateSaver shadowStateSaver(context, boxShadowShouldBeAppliedToBackground);
             if (boxShadowShouldBeAppliedToBackground)
                 BoxPainter::applyBoxShadowForBackground(context, obj);
 
             if (bgColor.alpha())
                 context.fillRect(backgroundRect, bgColor);
         }
     }
 
@@ skipping 245 matching lines @@
     }
 }
 
 bool BoxPainter::shouldForceWhiteBackgroundForPrintEconomy(const ComputedStyle& style, const Document& document)
 {
     return document.printing() && style.getPrintColorAdjust() == PrintColorAdjustEconomy
         && (!document.settings() || !document.settings()->shouldPrintBackgrounds());
 }
 
 } // namespace blink