Let slimmingPaintInvalidation plumbing work for spv1

third_party/WebKit/Source/core/layout/LayoutObject.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 216 matching lines @@
     , m_node(node)
     , m_parent(nullptr)
     , m_previous(nullptr)
     , m_next(nullptr)
 #if ENABLE(ASSERT)
     , m_hasAXObject(false)
     , m_setNeedsLayoutForbidden(false)
 #endif
     , m_bitfields(node)
 {
-    // TODO(wangxianzhu): Move this into initialization list when we enable the feature by default.
-    if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
-        m_previousPositionFromPaintInvalidationBacking = uninitializedPaintOffset();
     InstanceCounters::incrementCounter(InstanceCounters::LayoutObjectCounter);
     if (m_node)
         frameView()->incrementLayoutObjectCount();
 }
 
 LayoutObject::~LayoutObject()
 {
     ASSERT(!m_hasAXObject);
     InstanceCounters::decrementCounter(InstanceCounters::LayoutObjectCounter);
 }
@@ skipping 870 matching lines @@
     return IntSize();
 }
 
 LayoutRect LayoutObject::invalidatePaintRectangle(const LayoutRect& dirtyRect, DisplayItemClient* displayItemClient) const
 {
     return ObjectPaintInvalidator(*this).invalidatePaintRectangle(dirtyRect, displayItemClient);
 }
 
 void LayoutObject::invalidateTreeIfNeeded(const PaintInvalidationState& paintInvalidationState)
 {
+    DCHECK(!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
     ensureIsReadyForPaintInvalidation();
 
     // If we didn't need paint invalidation then our children don't need as well.
     // Skip walking down the tree as everything should be fine below us.
     if (!shouldCheckForPaintInvalidation(paintInvalidationState))
         return;
 
     PaintInvalidationState newPaintInvalidationState(paintInvalidationState, *this);
 
     if (mayNeedPaintInvalidationSubtree())
         newPaintInvalidationState.setForceSubtreeInvalidationCheckingWithinContainer();
 
     PaintInvalidationReason reason = invalidatePaintIfNeeded(newPaintInvalidationState);
     clearPaintInvalidationFlags();
 
     newPaintInvalidationState.updateForChildren(reason);
     invalidatePaintOfSubtreesIfNeeded(newPaintInvalidationState);
 }
 
 void LayoutObject::invalidatePaintOfSubtreesIfNeeded(const PaintInvalidationState& childPaintInvalidationState)
 {
+    DCHECK(!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
+
     for (LayoutObject* child = slowFirstChild(); child; child = child->nextSibling()) {
         // Column spanners are invalidated through their placeholders.
         // See LayoutMultiColumnSpannerPlaceholder::invalidatePaintOfSubtreesIfNeeded().
         if (child->isColumnSpanAll())
             continue;
         child->invalidateTreeIfNeeded(childPaintInvalidationState);
     }
 }
 
 LayoutRect LayoutObject::selectionRectInViewCoordinates() const
@@ skipping 2056 matching lines @@
         return;
     m_bitfields.setIsBackgroundAttachmentFixedObject(isBackgroundAttachmentFixedObject);
     if (isBackgroundAttachmentFixedObject)
         frameView()->addBackgroundAttachmentFixedObject(this);
     else
         frameView()->removeBackgroundAttachmentFixedObject(this);
 }
 
 const ObjectPaintProperties* LayoutObject::objectPaintProperties() const
 {
-    ASSERT(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
+    DCHECK(RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
     return objectPaintPropertiesMap().get(this);
 }
 
 ObjectPaintProperties& LayoutObject::ensureObjectPaintProperties()
 {
-    DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
+    DCHECK(RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
     auto addResult = objectPaintPropertiesMap().add(this, nullptr);
     if (addResult.isNewEntry)
         addResult.storedValue->value = ObjectPaintProperties::create();
 
     return *addResult.storedValue->value;
 }
 
 } // namespace blink
 
 #ifndef NDEBUG
@@ skipping 25 matching lines @@
         const blink::LayoutObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
     } else {
         WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
     }
 }
 
 #endif