Make UA DOMActivate events composed events

third_party/WebKit/Source/core/dom/Node.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  *
@@ skipping 2077 matching lines @@
 #endif
 
   if (!document().hasListenerType(Document::DOMSUBTREEMODIFIED_LISTENER))
     return;
 
   dispatchScopedEvent(
       MutationEvent::create(EventTypeNames::DOMSubtreeModified, true));
 }
 
 DispatchEventResult Node::dispatchDOMActivateEvent(int detail,
-                                                   Event* underlyingEvent) {
+                                                   Event& underlyingEvent) {
 #if DCHECK_IS_ON()
   DCHECK(!EventDispatchForbiddenScope::isEventDispatchForbidden());
 #endif
   UIEvent* event = UIEvent::create();
   event->initUIEvent(EventTypeNames::DOMActivate, true, true,
                      document().domWindow(), detail);
-  event->setUnderlyingEvent(underlyingEvent);
+  event->setUnderlyingEvent(&underlyingEvent);
+  event->setComposed(underlyingEvent.composed());
   dispatchScopedEvent(event);
 
   // TODO(dtapuska): Dispatching scoped events shouldn't check the return
   // type because the scoped event could get put off in the delayed queue.
   return EventTarget::dispatchEventResult(*event);
 }
 
 DispatchEventResult Node::dispatchMouseEvent(
     const PlatformMouseEvent& nativeEvent,
     const AtomicString& eventType,
@@ skipping 23 matching lines @@
   if (eventType == EventTypeNames::keydown ||
       eventType == EventTypeNames::keypress) {
     if (event->isKeyboardEvent()) {
       if (LocalFrame* frame = document().frame())
         frame->eventHandler().defaultKeyboardEventHandler(
             toKeyboardEvent(event));
     }
   } else if (eventType == EventTypeNames::click) {
     int detail =
         event->isUIEvent() ? static_cast<UIEvent*>(event)->detail() : 0;
-    if (dispatchDOMActivateEvent(detail, event) !=
+    if (dispatchDOMActivateEvent(detail, *event) !=
         DispatchEventResult::NotCanceled)
       event->setDefaultHandled();
   } else if (eventType == EventTypeNames::contextmenu) {
     if (Page* page = document().page())
       page->contextMenuController().handleContextMenuEvent(event);
   } else if (eventType == EventTypeNames::textInput) {
     if (event->hasInterface(EventNames::TextEvent)) {
       if (LocalFrame* frame = document().frame())
         frame->eventHandler().defaultTextInputEventHandler(toTextEvent(event));
     }
@@ skipping 330 matching lines @@
   if (node) {
     std::stringstream stream;
     node->printNodePathTo(stream);
     LOG(INFO) << stream.str();
   } else {
     LOG(INFO) << "Cannot showNodePath for <null>";
   }
 }
 
 #endif