Alternate way to track first paint

Source/core/rendering/RenderObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 83 matching lines @@
 #ifndef NDEBUG
 #include <stdio.h>
 #endif
 
 namespace blink {
 
 namespace {
 
 static bool gModifyRenderTreeStructureAnyState = false;
 
-typedef WillBeHeapHashSet<RawPtrWillBeWeakMember<const RenderObject> > RenderObjectWeakSet;
-RenderObjectWeakSet& renderObjectNeverHadPaintInvalidationSet()
-{
-    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<RenderObjectWeakSet>, set, (adoptPtrWillBeNoop(new RenderObjectWeakSet())));
-    return *set;
-}
-
 } // namespace
 
 using namespace HTMLNames;
 
 #if ENABLE(ASSERT)
 
 RenderObject::SetLayoutNeededForbiddenScope::SetLayoutNeededForbiddenScope(RenderObject& renderObject)
     : m_renderObject(renderObject)
     , m_preexistingForbidden(m_renderObject.isSetNeedsLayoutForbidden())
 {
@@ skipping 114 matching lines @@
     , m_next(nullptr)
 #if ENABLE(ASSERT)
     , m_hasAXObject(false)
     , m_setNeedsLayoutForbidden(false)
 #if ENABLE(OILPAN)
     , m_didCallDestroy(false)
 #endif
 #endif
     , m_bitfields(node)
 {
-    if (firstPaintInvalidationTrackingEnabled())
-        renderObjectNeverHadPaintInvalidationSet().add(this);
-
 #ifndef NDEBUG
     renderObjectCounter.increment();
 #endif
     ++s_instanceCount;
 }
 
 RenderObject::~RenderObject()
 {
-    if (firstPaintInvalidationTrackingEnabled())
-        renderObjectNeverHadPaintInvalidationSet().remove(this);
-
     ASSERT(!m_hasAXObject);
 #if ENABLE(OILPAN)
     ASSERT(m_didCallDestroy);
 #endif
 #ifndef NDEBUG
     renderObjectCounter.decrement();
 #endif
     --s_instanceCount;
 }
 
@@ skipping 812 matching lines @@
     topLevelRect = result;
     for (RenderObject* current = slowFirstChild(); current; current = current->nextSibling())
         current->addAbsoluteRectForLayer(result);
     return result;
 }
 
 void RenderObject::paint(PaintInfo&, const LayoutPoint&)
 {
 }
 
-void RenderObject::setHadPaintInvalidation()
-{
-    if (firstPaintInvalidationTrackingEnabled())
-        renderObjectNeverHadPaintInvalidationSet().remove(this);
-}
-
-bool RenderObject::hadPaintInvalidation() const
-{
-    if (!firstPaintInvalidationTrackingEnabled())
-        return true;
-
-    return !renderObjectNeverHadPaintInvalidationSet().contains(this);
-}
-
 const RenderLayerModelObject* RenderObject::containerForPaintInvalidation() const
 {
     RELEASE_ASSERT(isRooted());
     return adjustCompositedContainerForSpecialAncestors(enclosingCompositedContainer());
 }
 
 const RenderLayerModelObject* RenderObject::enclosingCompositedContainer() const
 {
     RenderLayerModelObject* container = 0;
     // FIXME: CompositingState is not necessarily up to date for many callers of this function.
@@ skipping 77 matching lines @@
     TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject::invalidatePaintUsingContainer()",
         "object", this->debugName().ascii(),
         "info", jsonObjectForPaintInvalidationInfo(r, invalidationReasonToString(invalidationReason)));
 
     if (paintInvalidationContainer->isRenderFlowThread()) {
         toRenderFlowThread(paintInvalidationContainer)->paintInvalidationRectangleInRegions(r);
         return;
     }
 
     if (paintInvalidationContainer->isRenderView()) {
-        toRenderView(paintInvalidationContainer)->invalidatePaintForRectangle(r);
+        toRenderView(paintInvalidationContainer)->invalidatePaintForRectangle(r, invalidationReason);
         return;
     }
 
     if (paintInvalidationContainer->view()->usesCompositing()) {
         ASSERT(paintInvalidationContainer->isPaintInvalidationContainer());
-        paintInvalidationContainer->setBackingNeedsPaintInvalidationInRect(r);
+        paintInvalidationContainer->setBackingNeedsPaintInvalidationInRect(r, invalidationReason);
     }
 }
 
 LayoutRect RenderObject::boundsRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const
 {
     if (!paintInvalidationContainer)
         return computePaintInvalidationRect(paintInvalidationContainer, paintInvalidationState);
     return RenderLayer::computePaintInvalidationRect(this, paintInvalidationContainer->layer(), paintInvalidationState);
 }
 
@@ skipping 36 matching lines @@
     case InvalidationBecameVisible:
         return "became visible";
     case InvalidationBecameInvisible:
         return "became invisible";
     case InvalidationScroll:
         return "scroll";
     case InvalidationSelection:
         return "selection";
     case InvalidationLayer:
         return "layer";
+    case InvalidationRendererInsertion:
+        return "renderer insertion";
     case InvalidationRendererRemoval:
         return "renderer removal";
     case InvalidationPaintRectangle:
         return "invalidate paint rectangle";
     }
     ASSERT_NOT_REACHED();
     return "";
 }
 
 void RenderObject::invalidateTreeIfNeeded(const PaintInvalidationState& paintInvalidationState)
@@ skipping 62 matching lines @@
     }
 
     fullyInvalidatePaint(paintInvalidationContainer, invalidationReason, oldBounds, newBounds);
     return invalidationReason;
 }
 
 InvalidationReason RenderObject::getPaintInvalidationReason(const RenderLayerModelObject& paintInvalidationContainer,
     const LayoutRect& oldBounds, const LayoutPoint& oldPositionFromPaintInvalidationBacking, const LayoutRect& newBounds, const LayoutPoint& newPositionFromPaintInvalidationBacking)
 {
     if (shouldDoFullPaintInvalidation())
-        return InvalidationFull;
+        return m_bitfields.fullPaintInvalidationReason();
 
     // Presumably a background or a border exists if border-fit:lines was specified.
     if (style()->borderFit() == BorderFitLines)
         return InvalidationBorderFitLines;
 
     if (compositingState() != PaintsIntoOwnBacking && newPositionFromPaintInvalidationBacking != oldPositionFromPaintInvalidationBacking)
         return InvalidationLocationChange;
 
     // If the bounds are the same then we know that none of the statements below
     // can match, so we can early out since we will not need to do any
@@ skipping 1733 matching lines @@
     return false;
 }
 
 bool RenderObject::isRelayoutBoundaryForInspector() const
 {
     return objectIsRelayoutBoundary(this);
 }
 
 void RenderObject::setShouldDoFullPaintInvalidation(bool b, MarkingBehavior markBehavior)
 {
+    if (b)
+        setShouldDoFullPaintInvalidationWithReason(InvalidationFull, markBehavior);
+    else
+        m_bitfields.setFullPaintInvalidationReason(InvalidationNone);
+}
+
+void RenderObject::setShouldDoFullPaintInvalidationWithReason(InvalidationReason reason, MarkingBehavior markBehavior)
+{
+    // Only full invalidation reasons are allowed.
+    ASSERT(reason != InvalidationNone && reason != InvalidationIncremental);
+
     // RenderText objects don't know how to invalidate paint for themselves, since they don't know how to compute their bounds.
     // Instead the parent fully invalidate when any text needs full paint invalidation.
     if (isText()) {
-        parent()->setShouldDoFullPaintInvalidation(b, markBehavior);
+        parent()->setShouldDoFullPaintInvalidationWithReason(reason, markBehavior);
         return;
     }
 
-    m_bitfields.setShouldDoFullPaintInvalidation(b);
+    if (m_bitfields.fullPaintInvalidationReason() == InvalidationNone)
+        m_bitfields.setFullPaintInvalidationReason(reason);
 
-    if (markBehavior == MarkContainingBlockChain && b) {
+    if (markBehavior == MarkContainingBlockChain) {
         ASSERT(document().lifecycle().state() != DocumentLifecycle::InPaintInvalidation);
         frame()->page()->animator().scheduleVisualUpdate(); // In case that this is called not during FrameView::updateLayoutAndStyleForPainting().
         markContainingBlockChainForPaintInvalidation();
     }
 }
 
 void RenderObject::clearPaintInvalidationState(const PaintInvalidationState& paintInvalidationState)
 {
     // paintInvalidationStateIsDirty should be kept in sync with the
     // booleans that are cleared below.
@@ skipping 65 matching lines @@
 {
     if (object1) {
         const blink::RenderObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
     }
 }
 
 #endif