Promote inlines to first-class invalidation citizens

Source/core/rendering/RenderBox.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 1529 matching lines @@
             }
 
             layerRenderer->invalidatePaintRectangle(geometry.destRect());
             if (geometry.destRect() == rendererRect)
                 return true;
         }
     }
     return false;
 }
 
-void RenderBox::invalidateTreeIfNeeded(const PaintInvalidationState& paintInvalidationState)
-{
-    // FIXME: Currently only using this logic for RenderBox and its ilk. Ideally, RenderBlockFlows with
-    // inline children should track a dirty rect in local coordinates for dirty lines instead of invalidating
-    // the world.
-    // FIXME: We should still be recursing through inline's children, as they can have boxes, but we don't
-    // appear to have tests for this?
-    // FIXME: SVG should probably also go through this unified paint invalidation system.
-    ASSERT(!needsLayout());
-
-    if (!shouldCheckForPaintInvalidation())
-        return;
-
-    bool establishesNewPaintInvalidationContainer = isPaintInvalidationContainer();
-    const RenderLayerModelObject& newPaintInvalidationContainer = *adjustCompositedContainerForSpecialAncestors(establishesNewPaintInvalidationContainer ? this : &paintInvalidationState.paintInvalidationContainer());
-    ASSERT(&newPaintInvalidationContainer == containerForPaintInvalidation());
-
-    invalidatePaintIfNeeded(paintInvalidationState, newPaintInvalidationContainer);
-
-    // This is for the next invalidatePaintIfNeeded so must be after invalidatePaintIfNeeded.
-    savePreviousBorderBoxSizeIfNeeded();
-
-    PaintInvalidationState childTreeWalkState(paintInvalidationState, *this, newPaintInvalidationContainer);
-    RenderObject::invalidateTreeIfNeeded(childTreeWalkState);
-}
-
 void RenderBox::invalidatePaintIfNeeded(const PaintInvalidationState& paintInvalidationState, const RenderLayerModelObject& newPaintInvalidationContainer)
 {
     const LayoutRect oldPaintInvalidationRect = previousPaintInvalidationRect();
     const LayoutPoint oldPositionFromPaintInvalidationContainer = previousPositionFromPaintInvalidationContainer();
     setPreviousPaintInvalidationRect(boundsRectForPaintInvalidation(&newPaintInvalidationContainer, &paintInvalidationState));
     setPreviousPositionFromPaintInvalidationContainer(RenderLayer::positionFromPaintInvalidationContainer(this, &newPaintInvalidationContainer, &paintInvalidationState));
 
     // If we are set to do a full paint invalidation that means the RenderView will be
     // issue paint invalidations. We can then skip issuing of paint invalidations for the child
     // renderers as they'll be covered by the RenderView.
-    if (view()->doingFullPaintInvalidation())
-        return;
+    if (!view()->doingFullPaintInvalidation()) {
+        if ((onlyNeededPositionedMovementLayout() && compositingState() != PaintsIntoOwnBacking)
+            || (shouldDoFullPaintInvalidationIfSelfPaintingLayer()
+                && hasLayer()
+                && layer()->isSelfPaintingLayer())) {
+            setShouldDoFullPaintInvalidation(true, MarkOnlyThis);
+        }
 
-    if ((onlyNeededPositionedMovementLayout() && compositingState() != PaintsIntoOwnBacking)
-        || (shouldDoFullPaintInvalidationIfSelfPaintingLayer()
-            && hasLayer()
-            && layer()->isSelfPaintingLayer())) {
-        setShouldDoFullPaintInvalidation(true, MarkOnlyThis);
+        if (!RenderObject::invalidatePaintIfNeeded(newPaintInvalidationContainer, oldPaintInvalidationRect, oldPositionFromPaintInvalidationContainer, paintInvalidationState))
+            invalidatePaintForOverflowIfNeeded();
+
+        // Issue paint invalidations for any scrollbars if there is a scrollable area for this renderer.
+        if (enclosingLayer()) {
+            if (RenderLayerScrollableArea* area = enclosingLayer()->scrollableArea()) {
+                if (area->hasVerticalBarDamage())
+                    invalidatePaintRectangle(area->verticalBarDamage());
+                if (area->hasHorizontalBarDamage())
+                    invalidatePaintRectangle(area->horizontalBarDamage());
+                area->resetScrollbarDamage();
+            }
+        }
     }
 
-    if (!RenderObject::invalidatePaintIfNeeded(newPaintInvalidationContainer, oldPaintInvalidationRect, oldPositionFromPaintInvalidationContainer, paintInvalidationState))
-        invalidatePaintForOverflowIfNeeded();
-
-    // Issue paint invalidations for any scrollbars if there is a scrollable area for this renderer.
-    if (enclosingLayer()) {
-        if (RenderLayerScrollableArea* area = enclosingLayer()->scrollableArea()) {
-            if (area->hasVerticalBarDamage())
-                invalidatePaintRectangle(area->verticalBarDamage());
-            if (area->hasHorizontalBarDamage())
-                invalidatePaintRectangle(area->horizontalBarDamage());
-            area->resetScrollbarDamage();
-        }
-    }
+    savePreviousBorderBoxSizeIfNeeded();

[dsinclair, 2014/08/05 15:09:47]

Should we keep the comment that this has to be after the invalidatePaintIfNeeded
call?

[leviw_travelin_and_unemployed, 2014/08/05 22:34:44]

Done.

 }
 
 bool RenderBox::pushContentsClip(PaintInfo& paintInfo, const LayoutPoint& accumulatedOffset, ContentsClipBehavior contentsClipBehavior)
 {
     if (paintInfo.phase == PaintPhaseBlockBackground || paintInfo.phase == PaintPhaseSelfOutline || paintInfo.phase == PaintPhaseMask)
         return false;
 
     bool isControlClip = hasControlClip();
     bool isOverflowClip = hasOverflowClip() && !layer()->isSelfPaintingLayer();
 
@@ skipping 3060 matching lines @@
 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style)
 {
     backgroundColor = style.visitedDependentColor(CSSPropertyBackgroundColor);
     hasBackground = backgroundColor.alpha() || style.hasBackgroundImage();
     ASSERT(hasBackground == style.hasBackground());
     hasBorder = style.hasBorder();
     hasAppearance = style.hasAppearance();
 }
 
 } // namespace blink