WebCore/ChangeLog

2010-12-02  Dimitri Glazkov  <dglazkov@chromium.org>

        Reviewed by NOBODY (OOPS!).

        REGRESSION(r72783): DOMActivate fires multiple times from input type=file

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

        No new tests. (OOPS!)

        * dom/EventContext.cpp: Reverted changes made in r72783.

        * dom/EventContext.h: Ditto.

        * dom/Node.cpp:

        (WebCore::Node::containsIncludingShadowDOM): Added.

        (WebCore::Node::dispatchGenericEvent): Reverted changes made in r72783.

        * dom/Node.h: Added decl.

        * html/HTMLLabelElement.cpp:

        (WebCore::HTMLLabelElement::defaultEventHandler): Reverted changes made in r72783.

2010-12-02  Vincent Scheib  <scheib@chromium.org>

        Reviewed by Darin Fisher.

WebCore/dom/EventContext.cpp

@@EventContext::EventContext(PassRefPtr<Node> node, PassRefPtr<EventTarget> curren

{

}

void EventContext::defaultEventHandler(Event* event) const

{

    event->setTarget(m_target.get());

    event->setCurrentTarget(m_currentTarget.get());

    m_node->defaultEventHandler(event);

}

void EventContext::handleLocalEvents(Event* event) const

{

    event->setTarget(m_target.get());

WebCore/dom/EventContext.h

@@public:

    Node* node() const;

    EventTarget* target() const;

45 void defaultEventHandler(Event*) const;

    void handleLocalEvents(Event*) const;

private:

WebCore/dom/Node.cpp

@@bool Node::contains(const Node* node) const

    return this == node || node->isDescendantOf(this);

}

bool Node::containsIncludingShadowDOM(Node* node)

{

    if (!node)

        return false;

    if (this == node)

        return true;

    for (ContainerNode* n = node->parentOrHostNode(); n; n = n->parentOrHostNode()) {

        if (n == this)

            return true;

    }

    return false;

}

void Node::attach()

{

    ASSERT(!attached());

@@doneDispatching:

        if (event->bubbles()) {

            size_t size = ancestors.size();

            for (size_t i = 0; i < size; ++i) {

2637 ancestors[i].defaultEventHandler(event.get());

2650 ancestors[i].node()->defaultEventHandler(event.get());

                ASSERT(!event->defaultPrevented());

                if (event->defaultHandled())

                    goto doneWithDefault;

WebCore/dom/Node.h

@@public:

    void checkSetPrefix(const AtomicString& prefix, ExceptionCode&);

    bool isDescendantOf(const Node*) const;

    bool contains(const Node*) const;

388 bool containsIncludingShadowDOM(Node*);

    // This method is used to do strict error-checking when adding children via

    // the public DOM API (e.g., appendChild()).

WebCore/html/HTMLLabelElement.cpp

@@void HTMLLabelElement::defaultEventHandler(Event* evt)

        // If we can't find a control or if the control received the click

        // event, then there's no need for us to do anything.

122 if (!element || (evt->target() && element->contains(evt->target()->toNode())))

122 if (!element || (evt->target() && element->containsIncludingShadowDOM(evt->target()->toNode())))

            return;

        processingClick = true;