Revert of Let FrameView track object paint invalidations

third_party/WebKit/Source/core/layout/LayoutBoxModelObject.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 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. 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 234 matching lines @@
     }
 
     // Fixed-position is painted using transform. In the case that the object
     // gets the same layout after changing position property, although no
     // re-raster (rect-based invalidation) is needed, display items should
     // still update their paint offset.
     if (oldStyle) {
         bool newStyleIsFixedPosition = style()->position() == FixedPosition;
         bool oldStyleIsFixedPosition = oldStyle->position() == FixedPosition;
         if (newStyleIsFixedPosition != oldStyleIsFixedPosition)
-            invalidateDisplayItemClientsIncludingNonCompositingDescendants(PaintInvalidationStyleChange);
+            invalidateDisplayItemClientsIncludingNonCompositingDescendants(nullptr, PaintInvalidationStyleChange);
     }
 
     // The used style for body background may change due to computed style change
     // on the document element because of background stealing.
     // Refer to backgroundStolenForBeingBody() and
     // http://www.w3.org/TR/css3-background/#body-background for more info.
     if (isDocumentElement()) {
         HTMLBodyElement* body = document().firstBodyElement();
         LayoutObject* bodyLayout = body ? body->layoutObject() : nullptr;
         if (bodyLayout && bodyLayout->isBoxModelObject()) {
@@ skipping 166 matching lines @@
     } else if (object.compositedScrollsWithRespectTo(*this)) {
         layer()->compositedLayerMapping()->setScrollingContentsNeedDisplayInRect(r, invalidationReason, object);
     } else if (usesCompositedScrolling()) {
         layer()->compositedLayerMapping()->setNonScrollingContentsNeedDisplayInRect(r, invalidationReason, object);
     } else {
         // Otherwise invalidate everything.
         layer()->compositedLayerMapping()->setContentsNeedDisplayInRect(r, invalidationReason, object);
     }
 }
 
+void LayoutBoxModelObject::invalidateDisplayItemClientOnBacking(const DisplayItemClient& displayItemClient, PaintInvalidationReason invalidationReason, const LayoutObject* layoutObject) const
+{
+    displayItemClient.setDisplayItemsUncached();
+
+    // We need to inform the GraphicsLayer about this paint invalidation only when we are tracking
+    // paint invalidation or ENABLE(ASSERT).
+#if !ENABLE(ASSERT)
+    if (!frameView()->isTrackingPaintInvalidations())
+        return;
+#endif
+
+    if (layer()->groupedMapping()) {
+        if (GraphicsLayer* squashingLayer = layer()->groupedMapping()->squashingLayer())
+            squashingLayer->displayItemClientWasInvalidated(displayItemClient, invalidationReason);
+    } else if (CompositedLayerMapping* compositedLayerMapping = layer()->compositedLayerMapping()) {
+        if (layoutObject && layoutObject->compositedScrollsWithRespectTo(*this))
+            compositedLayerMapping->scrollingDisplayItemClientWasInvalidated(displayItemClient, invalidationReason);
+        else
+            compositedLayerMapping->displayItemClientWasInvalidated(displayItemClient, invalidationReason);
+    }
+}
+
 void LayoutBoxModelObject::addOutlineRectsForNormalChildren(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset, IncludeBlockVisualOverflowOrNot includeBlockOverflows) const
 {
     for (LayoutObject* child = slowFirstChild(); child; child = child->nextSibling()) {
         // Outlines of out-of-flow positioned descendants are handled in LayoutBlock::addOutlineRects().
         if (child->isOutOfFlowPositioned())
             continue;
 
         // Outline of an element continuation or anonymous block continuation is added when we iterate the continuation chain.
         // See LayoutBlock::addOutlineRects() and LayoutInline::addOutlineRects().
         if (child->isElementContinuation()
@@ skipping 659 matching lines @@
     if (rootElementStyle->hasBackground())
         return false;
 
     if (node() != document().firstBodyElement())
         return false;
 
     return true;
 }
 
 } // namespace blink