Compute the normal flow list on the fly

Source/core/layout/LayoutTreeAsText.cpp

 /*
  * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 624 matching lines @@
                 << ")";
         }
     }
 
     ts << "\n";
 
     if (paintPhase != LayerPaintPhaseBackground)
         write(ts, *layer.layoutObject(), indent + 1, behavior);
 }
 
+static Vector<DeprecatedPaintLayerStackingNode*> normalFlowListFor(DeprecatedPaintLayerStackingNode* node)
+{
+    DeprecatedPaintLayerStackingNodeIterator it(*node, NormalFlowChildren);
+    Vector<DeprecatedPaintLayerStackingNode*> vector;
+    while (DeprecatedPaintLayerStackingNode* normalFlowChild = it.next())
+        vector.append(normalFlowChild);
+    return vector;
+}
+
 void LayoutTreeAsText::writeLayers(TextStream& ts, const DeprecatedPaintLayer* rootLayer, DeprecatedPaintLayer* layer,
     const LayoutRect& paintRect, int indent, LayoutAsTextBehavior behavior)
 {
     // Calculate the clip rects we should use.
     LayoutRect layerBounds;
     ClipRect damageRect, clipRectToApply, outlineRect;
     layer->clipper().calculateRects(ClipRectsContext(rootLayer, UncachedClipRects), paintRect, layerBounds, damageRect, clipRectToApply, outlineRect);
 
     // Ensure our lists are up-to-date.
     layer->stackingNode()->updateLayerListsIfNeeded();
@@ skipping 12 matching lines @@
             ts << " negative z-order list(" << negList->size() << ")\n";
             ++currIndent;
         }
         for (unsigned i = 0; i != negList->size(); ++i)
             writeLayers(ts, rootLayer, negList->at(i)->layer(), paintRect, currIndent, behavior);
     }
 
     if (shouldPaint)
         write(ts, *layer, layerBounds, damageRect.rect(), clipRectToApply.rect(), outlineRect.rect(), paintsBackgroundSeparately ? LayerPaintPhaseForeground : LayerPaintPhaseAll, indent, behavior);
 
-    if (Vector<DeprecatedPaintLayerStackingNode*>* normalFlowList = layer->stackingNode()->normalFlowList()) {
+    Vector<DeprecatedPaintLayerStackingNode*> normalFlowList = normalFlowListFor(layer->stackingNode());
+    if (!normalFlowList.isEmpty()) {
         int currIndent = indent;
         if (behavior & LayoutAsTextShowLayerNesting) {
             writeIndent(ts, indent);
-            ts << " normal flow list(" << normalFlowList->size() << ")\n";
+            ts << " normal flow list(" << normalFlowList.size() << ")\n";
             ++currIndent;
         }
-        for (unsigned i = 0; i != normalFlowList->size(); ++i)
-            writeLayers(ts, rootLayer, normalFlowList->at(i)->layer(), paintRect, currIndent, behavior);
+        for (unsigned i = 0; i != normalFlowList.size(); ++i)
+            writeLayers(ts, rootLayer, normalFlowList.at(i)->layer(), paintRect, currIndent, behavior);
     }
 
     if (Vector<DeprecatedPaintLayerStackingNode*>* posList = layer->stackingNode()->posZOrderList()) {
         int currIndent = indent;
         if (behavior & LayoutAsTextShowLayerNesting) {
             writeIndent(ts, indent);
             ts << " positive z-order list(" << posList->size() << ")\n";
             ++currIndent;
         }
         for (unsigned i = 0; i != posList->size(); ++i)
@@ skipping 136 matching lines @@
     element->document().updateLayout();
 
     LayoutObject* layoutObject = element->layoutObject();
     if (!layoutObject || !layoutObject->isListItem())
         return String();
 
     return toLayoutListItem(layoutObject)->markerText();
 }
 
 } // namespace blink