1 files changed, 0 insertions, 54 deletions
diff --git a/WebCore/rendering/RenderFrame.cpp b/WebCore/rendering/RenderFrame.cpp
index 3932c9a..46150ba 100644
--- a/WebCore/rendering/RenderFrame.cpp
+++ b/WebCore/rendering/RenderFrame.cpp
@@ -65,7 +65,6 @@ void RenderFrame::viewCleared()
         view->setMarginHeight(marginh);
 }
 
-<<<<<<< HEAD
 #ifdef FLATTEN_FRAMESET
 void RenderFrame::layout()
 {
@@ -94,58 +93,5 @@ void RenderFrame::layout()
     setNeedsLayout(false);
 }
 #endif
-void RenderFrame::layoutWithFlattening(bool fixedWidth, bool fixedHeight)
-{
-    // NOTE: The width and height have been set at this point by
-    // RenderFrameSet::positionFramesWithFlattening()
-
-    FrameView* childFrameView = static_cast<FrameView*>(widget());
-    RenderView* childRoot = childFrameView ? static_cast<RenderView*>(childFrameView->frame()->contentRenderer()) : 0;
-    HTMLFrameElement* element = static_cast<HTMLFrameElement*>(node());
-
-    // Do not expand framesets which has zero width or height
-    if (!width() || !height() || !childRoot) {
-        updateWidgetPosition();
-        if (childFrameView)
-            childFrameView->layout();
-        setNeedsLayout(false);
-        return;
-    }
-
-    // need to update to calculate min/max correctly
-    updateWidgetPosition();
-    if (childRoot->prefWidthsDirty())
-        childRoot->calcPrefWidths();
-
-    // if scrollbars are off, and the width or height are fixed
-    // we obey them and do not expand. With frame flattening
-    // no subframe much ever become scrollable.
-
-    bool isScrollable = element->scrollingMode() != ScrollbarAlwaysOff;
-
-    // make sure minimum preferred width is enforced
-    if (isScrollable || !fixedWidth || childRoot->isFrameSet())
-        setWidth(max(width(), childRoot->minPrefWidth()));
-
-    // update again to pass the width to the child frame
-    updateWidgetPosition();
-    childFrameView->layout();
-
-    // expand the frame by setting frame height = content height
-    if (isScrollable || !fixedHeight || childRoot->isFrameSet())
-        setHeight(max(height(), childFrameView->contentsHeight()));
-    if (isScrollable || !fixedWidth || childRoot->isFrameSet())
-        setWidth(max(width(), childFrameView->contentsWidth()));
-
-    updateWidgetPosition();
-
-    ASSERT(!childFrameView->layoutPending());
-    ASSERT(!childRoot->needsLayout());
-    ASSERT(!childRoot->firstChild() || !childRoot->firstChild()->firstChild() || !childRoot->firstChild()->firstChild()->needsLayout());
-
-    setNeedsLayout(false);
-}
 
-=======
->>>>>>> webkit.org at r58033
 } // namespace WebCore