Index: third_party/WebKit/Source/core/events/Event.cpp |
diff --git a/third_party/WebKit/Source/core/events/Event.cpp b/third_party/WebKit/Source/core/events/Event.cpp |
index 5d5066683a3fc669596c3601a524def76e44ba39..06662c3ce2522c776352b166d2f1df2d9495210d 100644 |
--- a/third_party/WebKit/Source/core/events/Event.cpp |
+++ b/third_party/WebKit/Source/core/events/Event.cpp |
@@ -58,20 +58,25 @@ Event::Event() |
} |
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) |
@@ -88,7 +93,7 @@ Event::Event(const AtomicString& eventType, bool canBubbleArg, bool cancelableAr |
} |
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()) |
{ |
} |