Refactor to simplify how layerType is stored on PaintLayers.

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 188 matching lines @@
         && (styleRef().originalDisplay() != oldStyle->originalDisplay())
         && ((styleRef().originalDisplay() == BLOCK) || (styleRef().originalDisplay() == INLINE_BLOCK))
         && ((oldStyle->originalDisplay() == BLOCK) || (oldStyle->originalDisplay() == INLINE_BLOCK)))
         parent()->setNeedsLayout(LayoutInvalidationReason::ChildChanged, MarkContainerChain);
 
     PaintLayerType type = layerTypeRequired();
     if (type != NoPaintLayer) {
         if (!layer() && layerCreationAllowedForSubtree()) {
             if (wasFloatingBeforeStyleChanged && isFloating())
                 setChildNeedsLayout();
-            createLayer(type);
+            createLayer();
             if (parent() && !needsLayout()) {
                 // FIXME: We should call a specialized version of this function.
                 layer()->updateLayerPositionsAfterLayout();
             }
         }
     } else if (layer() && layer()->parent()) {
         PaintLayer* parentLayer = layer()->parent();
         setHasTransformRelatedProperty(false); // Either a transform wasn't specified or the object doesn't support transforms, so just null out the bit.
         setHasReflection(false);
         layer()->removeOnlyThisLayerAfterStyleChange(); // calls destroyLayer() which clears m_layer
         if (wasFloatingBeforeStyleChanged && isFloating())
             setChildNeedsLayout();
         if (hadTransform)
             setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(LayoutInvalidationReason::StyleChange);
         if (!needsLayout()) {
             // FIXME: We should call a specialized version of this function.
             parentLayer->updateLayerPositionsAfterLayout();
         }
     }
 
     if (layer()) {
-        // FIXME: Ideally we shouldn't need this setter but we can't easily infer an overflow-only layer
-        // from the style.
-        layer()->setLayerType(type);
-
         layer()->styleDidChange(diff, oldStyle);
         if (hadLayer && layer()->isSelfPaintingLayer() != layerWasSelfPainting)
             setChildNeedsLayout();
     }
 
     if (oldStyle && wasHorizontalWritingMode != isHorizontalWritingMode()) {
         // Changing the getWritingMode() may change isOrthogonalWritingModeRoot()
         // of children. Make sure all children are marked/unmarked as orthogonal
         // writing-mode roots.
         bool newHorizontalWritingMode = isHorizontalWritingMode();
@@ skipping 79 matching lines @@
         return;
 
     // This intentionally uses the stale ancestor overflow layer compositing
     // input as if we have saved constraints for this layer they were saved
     // in the previous frame.
     DisableCompositingQueryAsserts disabler;
     if (const PaintLayer* ancestorOverflowLayer = layer()->ancestorOverflowLayer())
         ancestorOverflowLayer->getScrollableArea()->invalidateAllStickyConstraints();
 }
 
-void LayoutBoxModelObject::createLayer(PaintLayerType type)
+void LayoutBoxModelObject::createLayer()
 {
     ASSERT(!m_layer);
-    m_layer = adoptPtr(new PaintLayer(this, type));
+    m_layer = adoptPtr(new PaintLayer(this));
     setHasLayer(true);
     m_layer->insertOnlyThisLayerAfterStyleChange();
 }
 
 void LayoutBoxModelObject::destroyLayer()
 {
     setHasLayer(false);
     m_layer = nullptr;
 }
 
@@ skipping 770 matching lines @@
     if (rootElementStyle->hasBackground())
         return false;
 
     if (node() != document().firstBodyElement())
         return false;
 
     return true;
 }
 
 } // namespace blink