Remove frame flattening from rendering code.

Source/core/rendering/RenderFrameSet.cpp

 /**
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Simon Hausmann <hausmann@kde.org>
  *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
  * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 453 matching lines @@
 
     if (m_rows.m_sizes.size() != rows || m_cols.m_sizes.size() != cols) {
         m_rows.resize(rows);
         m_cols.resize(cols);
     }
 
     LayoutUnit borderThickness = frameSet()->border();
     layOutAxis(m_rows, frameSet()->rowLengths(), height() - (rows - 1) * borderThickness);
     layOutAxis(m_cols, frameSet()->colLengths(), width() - (cols - 1) * borderThickness);
 
-    if (flattenFrameSet())
-        positionFramesWithFlattening();
-    else
-        positionFrames();
+    positionFrames();
 
     RenderBox::layout();
 
     computeEdgeInfo();
 
     updateLayerTransform();
 
     if (doFullRepaint) {
         repaintUsingContainer(repaintContainer, pixelSnappedIntRect(oldBounds));
         LayoutRect newBounds = clippedOverflowRectForRepaint(repaintContainer);
@@ skipping 40 matching lines @@
     }
 
     // all the remaining frames are hidden to avoid ugly spurious unflowed frames
     for (; child; child = child->nextSiblingBox()) {
         child->setWidth(0);
         child->setHeight(0);
         child->setNeedsLayout(false);
     }
 }
 
-void RenderFrameSet::positionFramesWithFlattening()
-{
-    RenderBox* child = firstChildBox();
-    if (!child)
-        return;
-
-    int rows = frameSet()->totalRows();
-    int cols = frameSet()->totalCols();
-
-    int borderThickness = frameSet()->border();
-    bool repaintNeeded = false;
-
-    // calculate frameset height based on actual content height to eliminate scrolling
-    bool out = false;
-    for (int r = 0; r < rows && !out; r++) {
-        int extra = 0;
-        int height = m_rows.m_sizes[r];
-
-        for (int c = 0; c < cols; c++) {
-            IntRect oldFrameRect = pixelSnappedIntRect(child->frameRect());
-
-            int width = m_cols.m_sizes[c];
-
-            bool fixedWidth = frameSet()->colLengths() && frameSet()->colLengths()[c].isFixed();
-            bool fixedHeight = frameSet()->rowLengths() && frameSet()->rowLengths()[r].isFixed();
-
-            // has to be resized and itself resize its contents
-            if (!fixedWidth)
-                child->setWidth(width ? width + extra / (cols - c) : 0);
-            else
-                child->setWidth(width);
-            child->setHeight(height);
-
-            child->setNeedsLayout(true);
-
-            if (child->isFrameSet())
-                toRenderFrameSet(child)->layout();
-            else
-                toRenderFrame(child)->layoutWithFlattening(fixedWidth, fixedHeight);
-
-            if (child->height() > m_rows.m_sizes[r])
-                m_rows.m_sizes[r] = child->height();
-            if (child->width() > m_cols.m_sizes[c])
-                m_cols.m_sizes[c] = child->width();
-
-            if (child->frameRect() != oldFrameRect)
-                repaintNeeded = true;
-
-            // difference between calculated frame width and the width it actually decides to have
-            extra += width - m_cols.m_sizes[c];
-
-            child = child->nextSiblingBox();
-            if (!child) {
-                out = true;
-                break;
-            }
-        }
-    }
-
-    int xPos = 0;
-    int yPos = 0;
-    out = false;
-    child = firstChildBox();
-    for (int r = 0; r < rows && !out; r++) {
-        xPos = 0;
-        for (int c = 0; c < cols; c++) {
-            // ensure the rows and columns are filled
-            IntRect oldRect = pixelSnappedIntRect(child->frameRect());
-
-            child->setLocation(IntPoint(xPos, yPos));
-            child->setHeight(m_rows.m_sizes[r]);
-            child->setWidth(m_cols.m_sizes[c]);
-
-            if (child->frameRect() != oldRect) {
-                repaintNeeded = true;
-
-                // update to final size
-                child->setNeedsLayout(true);
-                if (child->isFrameSet())
-                    toRenderFrameSet(child)->layout();
-                else
-                    toRenderFrame(child)->layoutWithFlattening(true, true);
-            }
-
-            xPos += m_cols.m_sizes[c] + borderThickness;
-            child = child->nextSiblingBox();
-            if (!child) {
-                out = true;
-                break;
-            }
-        }
-        yPos += m_rows.m_sizes[r] + borderThickness;
-    }
-
-    setWidth(xPos - borderThickness);
-    setHeight(yPos - borderThickness);
-
-    if (repaintNeeded)
-        repaint();
-
-    // all the remaining frames are hidden to avoid ugly spurious unflowed frames
-    for (; child; child = child->nextSiblingBox()) {
-        child->setWidth(0);
-        child->setHeight(0);
-        child->setNeedsLayout(false);
-    }
-}
-
-bool RenderFrameSet::flattenFrameSet() const
-{
-    return frame() && frame()->settings() && frame()->settings()->frameFlatteningEnabled();
-}
-
 void RenderFrameSet::startResizing(GridAxis& axis, int position)
 {
     int split = hitTestSplit(axis, position);
     if (split == noSplit || axis.m_preventResize[split]) {
         axis.m_splitBeingResized = noSplit;
         return;
     }
     axis.m_splitBeingResized = split;
     axis.m_splitResizeOffset = position - splitPosition(axis, split);
 }
 
 void RenderFrameSet::continueResizing(GridAxis& axis, int position)
 {
     if (needsLayout())
         return;
     if (axis.m_splitBeingResized == noSplit)
         return;
     int currentSplitPosition = splitPosition(axis, axis.m_splitBeingResized);
     int delta = (position - currentSplitPosition) - axis.m_splitResizeOffset;
     if (!delta)
         return;
     axis.m_deltas[axis.m_splitBeingResized - 1] += delta;
     axis.m_deltas[axis.m_splitBeingResized] -= delta;
     setNeedsLayout(true);
 }
 
 bool RenderFrameSet::userResize(MouseEvent* evt)
 {
-    if (flattenFrameSet())
-        return false;
-
     if (!m_isResizing) {
         if (needsLayout())
             return false;
         if (evt->type() == eventNames().mousedownEvent && evt->button() == LeftButton) {
             FloatPoint localPos = absoluteToLocal(evt->absoluteLocation(), UseTransforms);
             startResizing(m_cols, localPos.x());
             startResizing(m_rows, localPos.y());
             if (m_cols.m_splitBeingResized != noSplit || m_rows.m_splitBeingResized != noSplit) {
                 setIsResizing(true);
                 return true;
@@ skipping 117 matching lines @@
 void RenderFrameSet::GridAxis::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering);
     info.addMember(m_sizes, "sizes");
     info.addMember(m_deltas, "deltas");
     info.addMember(m_preventResize, "preventResize");
     info.addMember(m_allowBorder, "allowBorder");
 }
 
 } // namespace WebCore