New paint invalidation using paint property tree walk

third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp

Index: third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp
diff --git a/third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp b/third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp
index 018a76906d959c9a896be92f945e21a412535901..4c8222398003ee0eb867adbe85e737d164def920 100644
--- a/third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp
+++ b/third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp
@@ -12,6 +12,30 @@
 
 namespace blink {
 
+PaintInvalidationState::PaintInvalidationState(const PaintInvalidationState* parent, const LayoutObject& layoutObject, const LayoutBoxModelObject& paintInvalidationContainer, const LayoutPoint& paintOffset)
+    : m_clipped(false)
+    , m_cachedOffsetsEnabled(true)
+    , m_forcedSubtreeInvalidationWithinContainer(parent && parent->m_forcedSubtreeInvalidationWithinContainer)
+    , m_forcedSubtreeInvalidationRectUpdateWithinContainer(parent && parent->m_forcedSubtreeInvalidationRectUpdateWithinContainer)
+    , m_viewClippingAndScrollOffsetDisabled(false)
+    , m_paintOffset(toSize(paintOffset))
+    , m_paintInvalidationContainer(paintInvalidationContainer)
+    , m_pendingDelayedPaintInvalidations(nullptr)
+    , m_enclosingSelfPaintingLayer(parent ? parent->enclosingSelfPaintingLayer(layoutObject) : *paintInvalidationContainer.layer())
+{
+    ASSERT(RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
+
+    if (layoutObject == paintInvalidationContainer) {
+        // When we hit a new paint invalidation container, we don't need to
+        // continue forcing a check for paint invalidation, since we're
+        // descending into a different invalidation container. (For instance if
+        // our parents were moved, the entire container will just move.)
+        m_forcedSubtreeInvalidationWithinContainer = false;
+    }
+
+    // TODO(wangxianzhu): Handle transform, clipping, scrolling, etc.
+}
+
 PaintInvalidationState::PaintInvalidationState(const LayoutView& layoutView, Vector<LayoutObject*>& pendingDelayedPaintInvalidations, PaintInvalidationState* ownerPaintInvalidationState)
     : m_clipped(false)
     , m_cachedOffsetsEnabled(true)
@@ -19,9 +43,11 @@ PaintInvalidationState::PaintInvalidationState(const LayoutView& layoutView, Vec
     , m_forcedSubtreeInvalidationRectUpdateWithinContainer(false)
     , m_viewClippingAndScrollOffsetDisabled(false)
     , m_paintInvalidationContainer(layoutView.containerForPaintInvalidation())
-    , m_pendingDelayedPaintInvalidations(pendingDelayedPaintInvalidations)
+    , m_pendingDelayedPaintInvalidations(&pendingDelayedPaintInvalidations)
     , m_enclosingSelfPaintingLayer(*layoutView.layer())
 {
+    ASSERT(!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
+
     bool establishesPaintInvalidationContainer = layoutView == m_paintInvalidationContainer;
     if (!establishesPaintInvalidationContainer) {
         if ((ownerPaintInvalidationState && !ownerPaintInvalidationState->m_cachedOffsetsEnabled)
@@ -39,16 +65,18 @@ PaintInvalidationState::PaintInvalidationState(const LayoutView& layoutView, Vec
     m_clipped = true;
 }
 
-PaintInvalidationState::PaintInvalidationState(PaintInvalidationState& next, LayoutBoxModelObject& layoutObject, const LayoutBoxModelObject& paintInvalidationContainer)
+PaintInvalidationState::PaintInvalidationState(PaintInvalidationState& next, const LayoutBoxModelObject& layoutObject, const LayoutBoxModelObject& paintInvalidationContainer)
     : m_clipped(false)
     , m_cachedOffsetsEnabled(true)
     , m_forcedSubtreeInvalidationWithinContainer(next.m_forcedSubtreeInvalidationWithinContainer)
     , m_forcedSubtreeInvalidationRectUpdateWithinContainer(next.m_forcedSubtreeInvalidationRectUpdateWithinContainer)
     , m_viewClippingAndScrollOffsetDisabled(false)
     , m_paintInvalidationContainer(paintInvalidationContainer)
-    , m_pendingDelayedPaintInvalidations(next.pendingDelayedPaintInvalidationTargets())
+    , m_pendingDelayedPaintInvalidations(&next.pendingDelayedPaintInvalidationTargets())
     , m_enclosingSelfPaintingLayer(next.enclosingSelfPaintingLayer(layoutObject))
 {
+    ASSERT(!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
+
     // FIXME: SVG could probably benefit from a stack-based optimization like html does. crbug.com/391054
     bool establishesPaintInvalidationContainer = layoutObject == m_paintInvalidationContainer;
     bool fixed = layoutObject.style()->position() == FixedPosition;
@@ -108,7 +136,7 @@ PaintInvalidationState::PaintInvalidationState(PaintInvalidationState& next, con
     , m_clipRect(next.m_clipRect)
     , m_paintOffset(next.m_paintOffset)
     , m_paintInvalidationContainer(next.m_paintInvalidationContainer)
-    , m_pendingDelayedPaintInvalidations(next.pendingDelayedPaintInvalidationTargets())
+    , m_pendingDelayedPaintInvalidations(&next.pendingDelayedPaintInvalidationTargets())
     , m_enclosingSelfPaintingLayer(next.enclosingSelfPaintingLayer(layoutObject))
 {
     ASSERT(layoutObject != m_paintInvalidationContainer);