Simplify ImageResource::canRender()

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 "config.h"
 #include "core/paint/BoxPainter.h"
 
 #include "core/HTMLNames.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLFrameOwnerElement.h"
@@ skipping 125 matching lines @@
     if (m_layoutBox.backgroundStolenForBeingBody())
         return;
     if (m_layoutBox.boxDecorationBackgroundIsKnownToBeObscured())
         return;
     paintFillLayers(paintInfo, backgroundColor, m_layoutBox.style()->backgroundLayers(), paintRect, bleedAvoidance);
 }
 
 static bool isFillLayerOpaque(const FillLayer& layer, const LayoutObject& imageClient)
 {
     return layer.hasOpaqueImage(&imageClient)
-        && layer.image()->canRender(imageClient, imageClient.style()->effectiveZoom())
+        && layer.image()->canRender()
         && !layer.image()->imageSize(&imageClient, imageClient.style()->effectiveZoom()).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.
@@ skipping 274 matching lines @@
     case BorderFillBox:
         break;
     default:
         ASSERT_NOT_REACHED();
         break;
     }
 
     BackgroundImageGeometry geometry;
     if (bgImage)
         geometry.calculate(obj, paintInfo.paintContainer(), paintInfo.globalPaintFlags(), bgLayer, scrolledPaintRect);
-    bool shouldPaintBackgroundImage = bgImage && bgImage->canRender(obj, obj.style()->effectiveZoom());
+    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);
         if (boxShadowShouldBeAppliedToBackground || !backgroundImageOccludesBackgroundColor)  {
             GraphicsContextStateSaver shadowStateSaver(*context, boxShadowShouldBeAppliedToBackground);
@@ skipping 253 matching lines @@
     }
 }
 
 bool BoxPainter::shouldForceWhiteBackgroundForPrintEconomy(const ComputedStyle& style, const Document& document)
 {
     return document.printing() && style.printColorAdjust() == PrintColorAdjustEconomy
         && (!document.settings() || !document.settings()->shouldPrintBackgrounds());
 }
 
 } // namespace blink