Set paintingLayerNeedsRepaint() in layout tree

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 791 matching lines @@
     if (layoutObject()->isInFlowPositioned()) {
         LayoutSize newOffset = layoutObject()->offsetForInFlowPosition();
         if (m_rareData || !newOffset.isZero())
             ensureRareData().offsetForInFlowPosition = newOffset;
         localPoint.move(newOffset);
     } else if (m_rareData) {
         m_rareData->offsetForInFlowPosition = LayoutSize();
     }
 
     if (m_location != localPoint) {
-        setNeedsRepaint();
+        layoutObject()->setPaintingLayerNeedsRepaint();
     }
     m_location = localPoint;
 
 #if ENABLE(ASSERT)
     m_needsPositionUpdate = false;
 #endif
 }
 
 TransformationMatrix PaintLayer::perspectiveTransform() const
 {
@@ skipping 367 matching lines @@
         child->stackingNode()->dirtyStackingContextZOrderLists();
     }
 
     // Non-self-painting children paint into this layer, so the visible contents status of this layer is affected.
     if (!child->isSelfPaintingLayer())
         dirtyVisibleContentStatus();
 
     dirtyAncestorChainVisibleDescendantStatus();
     dirtyAncestorChainHasSelfPaintingLayerDescendantStatus();
 
-    child->setNeedsRepaint();
+    child->layoutObject()->setPaintingLayerNeedsRepaint();
 
     child->updateDescendantDependentFlags();
 }
 
 PaintLayer* PaintLayer::removeChild(PaintLayer* oldChild)
 {
     if (oldChild->previousSibling())
         oldChild->previousSibling()->setNextSibling(oldChild->nextSibling());
     if (oldChild->nextSibling())
         oldChild->nextSibling()->setPreviousSibling(oldChild->previousSibling());
@@ skipping 28 matching lines @@
     dirtyAncestorChainHasSelfPaintingLayerDescendantStatus();
 
     oldChild->updateDescendantDependentFlags();
 
     if (oldChild->m_hasVisibleContent || oldChild->m_hasVisibleDescendant)
         dirtyAncestorChainVisibleDescendantStatus();
 
     if (oldChild->enclosingPaginationLayer())
         oldChild->clearPaginationRecursive();
 
-    setNeedsRepaint();
+    layoutObject()->setPaintingLayerNeedsRepaint();
 
     return oldChild;
 }
 
 void PaintLayer::removeOnlyThisLayerAfterStyleChange()
 {
     if (!m_parent)
         return;
 
     bool didSetPaintInvalidation = false;
@@ skipping 57 matching lines @@
         curr->moveLayers(m_parent, this);
 
     // If the previous paint invalidation container is not a stacking context and this object is
     // stacked content, creating this layer may cause this object and its descendants to change
     // paint invalidation container.
     bool didSetPaintInvalidation = false;
     if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled() && !layoutObject()->isLayoutView() && layoutObject()->isRooted() && layoutObject()->styleRef().isStacked()) {
         const LayoutBoxModelObject& previousPaintInvalidationContainer = layoutObject()->parent()->containerForPaintInvalidation();
         if (!previousPaintInvalidationContainer.styleRef().isStackingContext()) {
             layoutObject()->invalidatePaintIncludingNonSelfPaintingLayerDescendants(previousPaintInvalidationContainer);
-            // Set needsRepaint along the original compositingContainer chain.
-            layoutObject()->parent()->enclosingLayer()->setNeedsRepaint();
             didSetPaintInvalidation = true;
         }
     }
 
     if (!didSetPaintInvalidation && isSelfPaintingLayer() && m_parent) {
         if (PaintLayer* enclosingSelfPaintingLayer = m_parent->enclosingSelfPaintingLayer())
             mergeNeedsPaintPhaseFlagsFrom(*enclosingSelfPaintingLayer);
     }
 
     // Clear out all the clip rects.
@@ skipping 1507 matching lines @@
             }
         } else {
             rect.append(logicalBoundingBox());
             rects.set(this, rect);
         }
     }
 }
 
 void PaintLayer::setNeedsRepaint()
 {
+    DCHECK(layoutObject()->document().lifecycle().state() == DocumentLifecycle::InPaintInvalidation
+        || layoutObject()->document().lifecycle().state() == DocumentLifecycle::InPrePaint);
+
+    if (m_needsRepaint)
+        return;
+
     m_needsRepaint = true;
-
-    // Do this unconditionally to ensure container chain is marked when compositing status of the layer changes.
     markCompositingContainerChainForNeedsRepaint();
 }
 
 void PaintLayer::markCompositingContainerChainForNeedsRepaint()
 {
     // Need to access compositingState(). We've ensured correct flag setting when compositingState() changes.
     DisableCompositingQueryAsserts disabler;
 
     PaintLayer* layer = this;
     while (true) {
@@ skipping 56 matching lines @@
 
 void showLayerTree(const blink::LayoutObject* layoutObject)
 {
     if (!layoutObject) {
         fprintf(stderr, "Cannot showLayerTree. Root is (nil)\n");
         return;
     }
     showLayerTree(layoutObject->enclosingLayer());
 }
 #endif