Set Event.composed flag correctly for some of UA UIEvents

third_party/WebKit/Source/core/events/Event.cpp

 /*
  * Copyright (C) 2001 Peter Kelly (pmk@post.com)
  * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de)
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2003, 2005, 2006, 2008 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.
@@ skipping 16 matching lines @@
 #include "core/events/EventTarget.h"
 #include "core/frame/HostsUsingFeatures.h"
 #include "core/frame/UseCounter.h"
 #include "core/svg/SVGElement.h"
 #include "core/timing/DOMWindowPerformance.h"
 #include "core/timing/Performance.h"
 #include "wtf/CurrentTime.h"
 
 namespace blink {
 
 static bool isScoped(const AtomicString& eventType)

[kochi, 2016/06/03 08:45:57]

As the user of this function is now only isScopedInV0(), can this function be
merged to it?
(not a strong opinion - keeping a separate function is still fine, but now this
check belongs only to V0, so it should make it clear that this type
classification
is only for V0)

[hayato, 2016/06/03 09:03:04]

Done

 {
     // WebKit never allowed selectstart event to cross the the shadow DOM boundary.
     // Changing this breaks existing sites.
     // See https://bugs.webkit.org/show_bug.cgi?id=52195 for details.
     return (eventType == EventTypeNames::abort
         || eventType == EventTypeNames::change
         || eventType == EventTypeNames::error
         || eventType == EventTypeNames::load
         || eventType == EventTypeNames::reset
         || eventType == EventTypeNames::resize
         || eventType == EventTypeNames::scroll
         || eventType == EventTypeNames::select
         || eventType == EventTypeNames::selectstart
         || eventType == EventTypeNames::slotchange);
 }
 
 Event::Event()
     : Event("", false, false)
 {
     m_wasInitialized = false;
 }
 
 Event::Event(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg)
-    : Event(eventType, canBubbleArg, cancelableArg, !isScoped(eventType), monotonicallyIncreasingTime())
+    : Event(eventType, canBubbleArg, cancelableArg, ComposedMode::Scoped, monotonicallyIncreasingTime())
 {
 }
 
 Event::Event(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg, double platformTimeStamp)
-    : Event(eventType, canBubbleArg, cancelableArg, !isScoped(eventType), platformTimeStamp)
+    : Event(eventType, canBubbleArg, cancelableArg, ComposedMode::Scoped, platformTimeStamp)
 {
 }
 
-Event::Event(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg, bool composed, double platformTimeStamp)
+Event::Event(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg, ComposedMode composedMode)
+    : Event(eventType, canBubbleArg, cancelableArg, composedMode, monotonicallyIncreasingTime())
+{
+}
+
+Event::Event(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg, ComposedMode composedMode, double platformTimeStamp)
     : m_type(eventType)
     , m_canBubble(canBubbleArg)
     , m_cancelable(cancelableArg)
-    , m_composed(composed)
+    , m_composed(composedMode == ComposedMode::Composed)
     , m_propagationStopped(false)
     , m_immediatePropagationStopped(false)
     , m_defaultPrevented(false)
     , m_defaultHandled(false)
     , m_cancelBubble(false)
     , m_wasInitialized(true)
     , m_isTrusted(false)
     , m_handlingPassive(false)
     , m_eventPhase(0)
     , m_currentTarget(nullptr)
     , m_createTime(convertSecondsToDOMTimeStamp(currentTime()))
     , m_platformTimeStamp(platformTimeStamp)
 {
 }
 
 Event::Event(const AtomicString& eventType, const EventInit& initializer)
-    : Event(eventType, initializer.bubbles(), initializer.cancelable(), initializer.composed(), monotonicallyIncreasingTime())
+    : Event(eventType, initializer.bubbles(), initializer.cancelable(), initializer.composed() ? ComposedMode::Composed : ComposedMode::Scoped, monotonicallyIncreasingTime())
 {
 }
 
 Event::~Event()
 {
 }
 
 bool Event::isScopedInV0() const
 {
     return isTrusted() && isScoped(m_type);
@@ skipping 257 matching lines @@
 
 DEFINE_TRACE(Event)
 {
     visitor->trace(m_currentTarget);
     visitor->trace(m_target);
     visitor->trace(m_underlyingEvent);
     visitor->trace(m_eventPath);
 }
 
 } // namespace blink