Center dialogs before computing overflow.

Source/core/rendering/RenderView.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/rendering/RenderView.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/frame/LocalFrame.h"
-#include "core/html/HTMLDialogElement.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/html/HTMLIFrameElement.h"
 #include "core/page/Page.h"
 #include "core/rendering/ColumnInfo.h"
 #include "core/rendering/FlowThreadController.h"
 #include "core/rendering/GraphicsContextAnnotator.h"
 #include "core/rendering/HitTestResult.h"
 #include "core/rendering/RenderFlowThread.h"
 #include "core/rendering/RenderGeometryMap.h"
 #include "core/rendering/RenderLayer.h"
@@ skipping 92 matching lines @@
     if (hasColumns())
         return columnInfo()->columnHeight();
     return RenderBlockFlow::availableLogicalHeight(heightType);
 }
 
 bool RenderView::isChildAllowed(RenderObject* child, RenderStyle*) const
 {
     return child->isBox();
 }
 
-static bool canCenterDialog(const RenderStyle* style)
-{
-    return (style->position() == AbsolutePosition || style->position() == FixedPosition) && style->hasAutoTopAndBottom();
-}
-
-void RenderView::positionDialog(RenderBox* box)
-{
-    HTMLDialogElement* dialog = toHTMLDialogElement(box->node());
-    if (dialog->centeringMode() == HTMLDialogElement::NotCentered)
-        return;
-    if (dialog->centeringMode() == HTMLDialogElement::Centered) {
-        if (canCenterDialog(box->style()))
-            box->setY(dialog->centeredPosition());
-        return;
-    }
-
-    ASSERT(dialog->centeringMode() == HTMLDialogElement::NeedsCentering);
-    if (!canCenterDialog(box->style())) {
-        dialog->setNotCentered();
-        return;
-    }
-    FrameView* frameView = document().view();
-    LayoutUnit top = (box->style()->position() == FixedPosition) ? 0 : frameView->scrollOffset().height();
-    int visibleHeight = frameView->visibleContentRect(IncludeScrollbars).height();
-    if (box->height() < visibleHeight)
-        top += (visibleHeight - box->height()) / 2;
-    box->setY(top);
-    dialog->setCentered(top);
-}
-
-void RenderView::positionDialogs()
-{
-    TrackedRendererListHashSet* positionedDescendants = positionedObjects();
-    if (!positionedDescendants)
-        return;
-    TrackedRendererListHashSet::iterator end = positionedDescendants->end();
-    for (TrackedRendererListHashSet::iterator it = positionedDescendants->begin(); it != end; ++it) {
-        RenderBox* box = *it;
-        if (isHTMLDialogElement(box->node()))
-            positionDialog(box);
-    }
-}
-
 void RenderView::layoutContent()
 {
     ASSERT(needsLayout());
 
     RenderBlockFlow::layout();
 
-    positionDialogs();
-
 #if ENABLE(ASSERT)
     checkLayoutState();
 #endif
 }
 
 #if ENABLE(ASSERT)
 void RenderView::checkLayoutState()
 {
     ASSERT(!m_layoutState->next());
 }
@@ skipping 809 matching lines @@
     return viewWidth(IncludeScrollbars) / scale;
 }
 
 double RenderView::layoutViewportHeight() const
 {
     float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1;
     return viewHeight(IncludeScrollbars) / scale;
 }
 
 } // namespace blink