Improve code readibility of PaintPropertyTreeBuilder

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 2623 matching lines @@
         if (registry.eventHandlerTargets(EventHandlerRegistry::TouchStartOrMoveEventBlocking)->contains(node()))
             registry.didRemoveEventHandler(*node(), EventHandlerRegistry::TouchStartOrMoveEventBlocking);
     }
 
     setAncestorLineBoxDirty(false);
 
     if (selectionPaintInvalidationMap)
         selectionPaintInvalidationMap->remove(this);
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
-        clearObjectPaintProperties();
+        objectPaintPropertiesMap().remove(this);
 
     clearLayoutRootIfNeeded();
 
     if (m_style) {
         for (const FillLayer* bgLayer = &m_style->backgroundLayers(); bgLayer; bgLayer = bgLayer->next()) {
             if (StyleImage* backgroundImage = bgLayer->image())
                 backgroundImage->removeClient(this);
         }
 
         for (const FillLayer* maskLayer = &m_style->maskLayers(); maskLayer; maskLayer = maskLayer->next()) {
@@ skipping 965 matching lines @@
     ASSERT(frameView());
     if (m_bitfields.isBackgroundAttachmentFixedObject() == isBackgroundAttachmentFixedObject)
         return;
     m_bitfields.setIsBackgroundAttachmentFixedObject(isBackgroundAttachmentFixedObject);
     if (isBackgroundAttachmentFixedObject)
         frameView()->addBackgroundAttachmentFixedObject(this);
     else
         frameView()->removeBackgroundAttachmentFixedObject(this);
 }
 
-ObjectPaintProperties* LayoutObject::objectPaintProperties() const
+const ObjectPaintProperties* LayoutObject::objectPaintProperties() const
 {
     ASSERT(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
     return objectPaintPropertiesMap().get(this);
 }
 
 ObjectPaintProperties& LayoutObject::ensureObjectPaintProperties()
 {
     DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
     auto addResult = objectPaintPropertiesMap().add(this, nullptr);
     if (addResult.isNewEntry)
         addResult.storedValue->value = ObjectPaintProperties::create();
 
     return *addResult.storedValue->value;
 }
 
-void LayoutObject::clearObjectPaintProperties()
-{
-    ASSERT(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
-    objectPaintPropertiesMap().remove(this);
-}
-
 } // namespace blink
 
 #ifndef NDEBUG
 
 void showTree(const blink::LayoutObject* object)
 {
     if (object)
         object->showTreeForThis();
     else
         WTFLogAlways("%s", "Cannot showTree. Root is (nil)");
@@ skipping 18 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