Use recomputed interest rect only if it changed enough

third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

 /*
  * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 2238 matching lines @@
     if (newInterestRect.y() == 0 && previousInterestRect.y() != 0)
         return true;
     if (newInterestRect.maxX() == layerSize.width() && previousInterestRect.maxX() != layerSize.width())
         return true;
     if (newInterestRect.maxY() == layerSize.height() && previousInterestRect.maxY() != layerSize.height())
         return true;
 
     return false;
 }
 
-void CompositedLayerMapping::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, GraphicsLayerPaintingPhase graphicsLayerPaintingPhase, const IntRect* interestRect) const
+IntRect CompositedLayerMapping::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, GraphicsLayerPaintingPhase graphicsLayerPaintingPhase, const IntRect* interestRect) const
 {
     IntRect defaultInterestRect;
+    IntRect previousInterestRect = graphicsLayer->previousInterestRect();
     if (RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled()) {
         if (!interestRect) {
             if (graphicsLayer == m_graphicsLayer || graphicsLayer == m_squashingLayer)
                 defaultInterestRect = computeInterestRect(graphicsLayer, m_owningLayer.layoutObject());
             else
                 defaultInterestRect = enclosingIntRect(FloatRect(FloatPoint(), graphicsLayer->size()));
-            interestRect = &defaultInterestRect;
+
+            if (interestRectChangedEnoughToRepaint(previousInterestRect, defaultInterestRect, expandedIntSize(graphicsLayer->size())))
+                interestRect = &defaultInterestRect;
+            else
+                interestRect = &previousInterestRect;
+        } else if (*interestRect != previousInterestRect) {
+            WTFLogAlways("Requested interest rect (%d,%d,%d,%d) is different from previous painted interest rect (%d,%d,%d,%d).",
+                interestRect->x(), interestRect->y(), interestRect->width(), interestRect->height(),
+                previousInterestRect.x(), previousInterestRect.y(), previousInterestRect.width(), previousInterestRect.height());
         }
 
         if (!m_owningLayer.needsRepaint()
             && !context.paintController().cacheIsEmpty()
-            && !interestRectChangedEnoughToRepaint(m_previousPaintInterestRect, *interestRect, expandedIntSize(graphicsLayer->size()))) {
+            && previousInterestRect == *interestRect) {
             context.paintController().createAndAppend<CachedDisplayItem>(*this, DisplayItem::CachedDisplayItemList);
-            return;
+            return previousInterestRect;
         }
-
-        m_previousPaintInterestRect = *interestRect;
     }
 
     ASSERT(interestRect);
     paintContentsInternal(graphicsLayer, context, graphicsLayerPaintingPhase, *interestRect);
+
+    return *interestRect;
 }
 
 void CompositedLayerMapping::paintContentsInternal(const GraphicsLayer* graphicsLayer, GraphicsContext& context, GraphicsLayerPaintingPhase graphicsLayerPaintingPhase, const IntRect& interestRect) const
 {
     // https://code.google.com/p/chromium/issues/detail?id=343772
     DisableCompositingQueryAsserts disabler;
 #if ENABLE(ASSERT)
     // FIXME: once the state machine is ready, this can be removed and we can refer to that instead.
     if (Page* page = layoutObject()->frame()->page())
         page->setIsPainting(true);
@@ skipping 228 matching lines @@
     } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) {
         name = "Scrolling Block Selection Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace blink