Fix <dialog> centering

Source/WebCore/html/HTMLDialogElement.cpp

 /*
  * Copyright (C) 2012 Google 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
@@ skipping 10 matching lines @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #if ENABLE(DIALOG_ELEMENT)
 #include "HTMLDialogElement.h"
 
 #include "ExceptionCode.h"
-#include "RenderDialog.h"
+#include "FrameView.h"
+#include "RenderBlock.h"
+#include "RenderStyle.h"
+#include "StyleResolver.h"
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
 HTMLDialogElement::HTMLDialogElement(const QualifiedName& tagName, Document* document)
     : HTMLElement(tagName, document)
+    , m_topIsValid(false)
+    , m_top(0)
 {
     ASSERT(hasTagName(dialogTag));
+    setHasCustomStyleCallbacks();
     ScriptWrappable::init(this);
 }
 
 PassRefPtr<HTMLDialogElement> HTMLDialogElement::create(const QualifiedName& tagName, Document* document)
 {
     return adoptRef(new HTMLDialogElement(tagName, document));
 }
 
 void HTMLDialogElement::close(ExceptionCode& ec)
 {
     if (!fastHasAttribute(openAttr)) {
         ec = INVALID_STATE_ERR;
         return;
     }
     setBooleanAttribute(openAttr, false);
     document()->removeFromTopLayer(this);
+    m_topIsValid = false;
+}
+
+PassRefPtr<RenderStyle> HTMLDialogElement::customStyleForRenderer()
+{
+    RefPtr<RenderStyle> originalStyle = document()->styleResolver()->styleForElement(this);
+    RefPtr<RenderStyle> style = RenderStyle::clone(originalStyle.get());
+
+    // Override top to remain centered after style recalcs.
+    if (style->position() == AbsolutePosition && style->top().isAuto() && style->bottom().isAuto()) {

[esprehn, 2013/04/16 08:32:06]

Can you put this check in a static helper method? You check it in two places
(one with a ! before it)

[falken, 2013/04/16 12:02:14]

Done.

+        if (m_topIsValid)
+            style->setTop(Length(m_top.toInt(), WebCore::Fixed));
+    }
+
+    return style.release();
+}
+
+void HTMLDialogElement::setupDefaultUnanchoredPosition()

[esprehn, 2013/04/16 08:32:06]

I might rename this positionAndReattach(), it's not entirely clear a setup*()
method also destroys your renderer and must be called after addToTopLayer

[falken, 2013/04/16 12:02:14]

Done.

+{
+    ASSERT(!m_topIsValid);
+
+    // Layout because we need to know our ancestors' positions and our own height.
+    document()->updateLayoutIgnorePendingStylesheets();
+
+    if (!renderer())
+        return;
+    RenderStyle* styleToUse = renderer()->style();
+    if (styleToUse->position() != AbsolutePosition || !styleToUse->top().isAuto() || !styleToUse->bottom().isAuto())
+        return;
+    RenderBlock* block = toRenderBlock(renderer());

[esprehn, 2013/04/16 08:32:06]

I'd use a renderBox() method instead and RenderBox* with a null check and early
return. Do we really require a RenderBlock? What if I did dialog { display:
table-row; } ?

[falken, 2013/04/16 12:02:14]

Done.

+
+    // Set up dialog's position to be safe-centered in the viewport.
+    // FIXME: Figure out what to do in vertical writing mode.
+    FrameView* frameView = document()->view();
+    int scrollTop = frameView->scrollOffset().height();
+    FloatPoint absolutePoint(0, scrollTop);
+    int visibleHeight = frameView->visibleContentRect(ScrollableArea::IncludeScrollbars).height();
+    if (block->height() < visibleHeight)
+        absolutePoint.move(0, (visibleHeight - block->height()) / 2);
+    FloatPoint localPoint = block->containingBlock()->absoluteToLocal(absolutePoint);
+
+    m_top = LayoutSize(localPoint.x(), localPoint.y()).height();
+    m_topIsValid = true;
+    reattach();

[esprehn, 2013/04/16 08:32:06]

You might add a FIXME here. We can instead mutate the RenderStyle directly here
and just call document()->updateLayoutIgnorePendingStylesheets() again and avoid
creating and destroying the dialog renderer again. Your current impl creates,
destroys and recreates the <dialog> renderer and all it's children when calling
show() which isn't super optimal. We can fix that later though.

[falken, 2013/04/16 12:02:14]

Done.

 }
 
 void HTMLDialogElement::show()
 {
     if (fastHasAttribute(openAttr))
         return;
     setBooleanAttribute(openAttr, true);
+    setupDefaultUnanchoredPosition();

[esprehn, 2013/04/16 08:32:06]

You can trivially make this assert by doing dialog.removeAttribute('open') and
then doing show() again. These checks don't look safe.

[falken, 2013/04/16 12:02:14]

Good point. I removed the assert and added a test that the dialog is recentered
if you call show() twice that way.

 }
 
 void HTMLDialogElement::showModal(ExceptionCode& ec)
 {
     if (fastHasAttribute(openAttr) || !inDocument()) {
         ec = INVALID_STATE_ERR;
         return;
     }
+    document()->addToTopLayer(this);
     setBooleanAttribute(openAttr, true);
-    document()->addToTopLayer(this);
+    setupDefaultUnanchoredPosition();
 }
 
 bool HTMLDialogElement::isPresentationAttribute(const QualifiedName& name) const
 {
     // FIXME: Workaround for <https://bugs.webkit.org/show_bug.cgi?id=91058>: modifying an attribute for which there is an attribute selector
     // in html.css sometimes does not trigger a style recalc.
     if (name == openAttr)
         return true;
 
     return HTMLElement::isPresentationAttribute(name);
 }
 
-RenderObject* HTMLDialogElement::createRenderer(RenderArena* arena, RenderStyle*)
-{
-    return new (arena) RenderDialog(this);
-}
-
 }
 
 #endif