From b297e0fa5c217c9467033b7c8b46891a52870120 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Tue, 16 Oct 2012 14:56:46 +0200
Subject: Revert "Imported WebKit commit
 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2
 (http://svn.webkit.org/repository/webkit/trunk@131300)"

This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78.

Caused OOM issues on some CI machines :(
---
 Source/WebCore/rendering/RenderTreeAsText.cpp | 55 ++++++++++++---------------
 1 file changed, 24 insertions(+), 31 deletions(-)

(limited to 'Source/WebCore/rendering/RenderTreeAsText.cpp')

diff --git a/Source/WebCore/rendering/RenderTreeAsText.cpp b/Source/WebCore/rendering/RenderTreeAsText.cpp
index ac6bd3452..813cf7e0c 100644
--- a/Source/WebCore/rendering/RenderTreeAsText.cpp
+++ b/Source/WebCore/rendering/RenderTreeAsText.cpp
@@ -655,31 +655,6 @@ static void write(TextStream& ts, RenderLayer& l,
         write(ts, *l.renderer(), indent + 1, behavior);
 }
 
-static void writeRenderRegionList(const RenderRegionList& flowThreadRegionList, TextStream& ts, int indent)
-{
-    for (RenderRegionList::const_iterator itRR = flowThreadRegionList.begin(); itRR != flowThreadRegionList.end(); ++itRR) {
-        RenderRegion* renderRegion = *itRR;
-        writeIndent(ts, indent + 2);
-        ts << "RenderRegion";
-        if (renderRegion->generatingNode()) {
-            String tagName = getTagName(renderRegion->generatingNode());
-            if (!tagName.isEmpty())
-                ts << " {" << tagName << "}";
-            if (renderRegion->generatingNode()->isElementNode() && renderRegion->generatingNode()->hasID()) {
-                Element* element = static_cast<Element*>(renderRegion->generatingNode());
-                ts << " #" << element->idForStyleResolution();
-            }
-            if (renderRegion->hasCustomRegionStyle())
-                ts << " region style: 1";
-            if (renderRegion->hasAutoLogicalHeight())
-                ts << " hasAutoLogicalHeight";
-        }
-        if (!renderRegion->isValid())
-            ts << " invalid";
-        ts << "\n";
-    }
-}
-
 static void writeRenderNamedFlowThreads(TextStream& ts, RenderView* renderView, const RenderLayer* rootLayer,
                         const LayoutRect& paintRect, int indent, RenderAsTextBehavior behavior)
 {
@@ -700,14 +675,32 @@ static void writeRenderNamedFlowThreads(TextStream& ts, RenderView* renderView,
         RenderLayer* layer = renderFlowThread->layer();
         writeLayers(ts, rootLayer, layer, paintRect, indent + 2, behavior);
 
-        // Display the valid and invalid render regions attached to this flow thread.
-        const RenderRegionList& validRegionsList = renderFlowThread->renderRegionList();
-        const RenderRegionList& invalidRegionsList = renderFlowThread->invalidRenderRegionList();
-        if (!validRegionsList.isEmpty() || !invalidRegionsList.isEmpty()) {
+        // Display the render regions attached to this flow thread
+        const RenderRegionList& flowThreadRegionList = renderFlowThread->renderRegionList();
+        if (!flowThreadRegionList.isEmpty()) {
             writeIndent(ts, indent + 1);
             ts << "Regions for flow '"<< renderFlowThread->flowThreadName() << "'\n";
-            writeRenderRegionList(validRegionsList, ts, indent);
-            writeRenderRegionList(invalidRegionsList, ts, indent);
+            for (RenderRegionList::const_iterator itRR = flowThreadRegionList.begin(); itRR != flowThreadRegionList.end(); ++itRR) {
+                RenderRegion* renderRegion = *itRR;
+                writeIndent(ts, indent + 2);
+                ts << "RenderRegion";
+                if (renderRegion->generatingNode()) {
+                    String tagName = getTagName(renderRegion->generatingNode());
+                    if (!tagName.isEmpty())
+                        ts << " {" << tagName << "}";
+                    if (renderRegion->generatingNode()->isElementNode() && renderRegion->generatingNode()->hasID()) {
+                        Element* element = static_cast<Element*>(renderRegion->generatingNode());
+                        ts << " #" << element->idForStyleResolution();
+                    }
+                    if (renderRegion->hasCustomRegionStyle())
+                        ts << " region style: 1";
+                    if (renderRegion->hasAutoLogicalHeight())
+                        ts << " hasAutoLogicalHeight";
+                }
+                if (!renderRegion->isValid())
+                    ts << " invalid";
+                ts << "\n";
+            }
         }
     }
 }
-- 
cgit v1.2.1