ChangeLog

2021-07-19  Tim Nguyen  <ntim@apple.com>

        Port <dialog> close event to modern event handling code

        https://bugs.webkit.org/show_bug.cgi?id=227915

        Reviewed by NOBODY (OOPS!).

        * html/HTMLDialogElement.cpp:

        (WebCore::HTMLDialogElement::HTMLDialogElement):

        (WebCore::HTMLDialogElement::create):

        (WebCore::HTMLDialogElement::close):

        (WebCore::dialogCloseEventSender): Deleted.

        (WebCore::HTMLDialogElement::~HTMLDialogElement): Deleted.

        (WebCore::HTMLDialogElement::dispatchPendingEvent): Deleted.

        * html/HTMLDialogElement.h:

2021-07-17  Alan Bujtas  <zalan@apple.com>

        [LFC][IFC] Move InlineLevelBox class to its own file

Source/WebCore/html/HTMLDialogElement.cpp

#include "config.h"

#include "HTMLDialogElement.h"

#include "EventNames.h"

29 #include "EventSender.h"

#include "HTMLNames.h"

#include <wtf/IsoMallocInlines.h>

@@WTF_MAKE_ISO_ALLOCATED_IMPL(HTMLDialogElement);

using namespace HTMLNames;

static DialogEventSender& dialogCloseEventSender()

{

    static NeverDestroyed<DialogEventSender> sharedCloseEventSender(eventNames().closeEvent);

    return sharedCloseEventSender;

}

4639HTMLDialogElement::HTMLDialogElement(const QualifiedName& tagName, Document& document)

4740 : HTMLElement(tagName, document)

41 , ActiveDOMObject(document)

{

}

51 HTMLDialogElement::~~~HTMLDi~~al~~ogEle~~ment()

45Ref<HTMLDialogElement> HTMLDialogElement::create(const QualifiedName& tagName, Document& document)

5246{

53 dialogCloseEventSender().cancelEvent(*this);

    auto dialogElement = adoptRef(*new HTMLDialogElement(tagName, document));

    dialogElement->suspendIfNeeded();

    return dialogElement;

}

void HTMLDialogElement::show()

@@void HTMLDialogElement::close(const String& result)

    // FIXME: Add step 6 from spec. (webkit.org/b/227537)

    dialogCloseEventSender().cancelEvent(*this);

    dialogCloseEventSender().dispatchEventSoon(*this);

}

void HTMLDialogElement::dispatchPendingEvent(DialogEventSender* eventSender)

{

    ASSERT_UNUSED(eventSender, eventSender == &dialogCloseEventSender());

    dispatchEvent(Event::create(eventNames().closeEvent, Event::CanBubble::No, Event::IsCancelable::No));

100 queueTaskToDispatchEvent(*this, TaskSource::UserInteraction, Event::create(eventNames().closeEvent, Event::CanBubble::No, Event::IsCancelable::No));

}

}

Source/WebCore/html/HTMLDialogElement.h

#pragma once

28#include "ActiveDOMObject.h"

#include "HTMLElement.h"

namespace WebCore {

template<typename T> class EventSender;

using DialogEventSender = EventSender<HTMLDialogElement>;

class HTMLDialogElement final : public HTMLElement {

33class HTMLDialogElement final : public HTMLElement, public ActiveDOMObject {

3634 WTF_MAKE_ISO_ALLOCATED(HTMLDialogElement);

3735public:

38 template<typename... Args> static Ref<HTMLDialogElement> create(Args&&... args) { return adoptRef(*new HTMLDialogElement(std::forward<Args>(args)...)); }

39 ~HTMLDialogElement();

36 static Ref<HTMLDialogElement> create(const QualifiedName&, Document&);

    bool isOpen() const { return hasAttribute(HTMLNames::openAttr); }

@@public:

    ExceptionOr<void> showModal();

    void close(const String&);

50 void dispatchPendingEvent(DialogEventSender*);

51

    bool isModal() const { return m_isModal; };

private:

@@private:

    String m_returnValue;

    bool m_isModal { false };

54

55 const char* activeDOMObjectName() const final { return "HTMLMarqueeElement"; }

};

} // namespace WebCore