Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(269)

Unified Diff: third_party/WebKit/Source/core/events/Event.cpp

Issue 1586563005: Add Event.scoped (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove error from test case as it bubbles up and fails test\ Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 1b2daab043a2a7a1fcdf81159dcaf9ef8ca4989c..9ea661ffbf59ef4f072c3f5cc3514fecc60ad2ee 100644
--- a/third_party/WebKit/Source/core/events/Event.cpp
+++ b/third_party/WebKit/Source/core/events/Event.cpp
@@ -34,20 +34,44 @@
namespace blink {
+static bool defaultScopedFromEventType(const AtomicString& eventType)
+{
+ 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);
+}
+
Event::Event()
- : Event("", false, false)
+ : Event("", false, false, false)
{
}
Event::Event(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg)
- : Event(eventType, canBubbleArg, cancelableArg, monotonicallyIncreasingTime())
+ : Event(eventType, canBubbleArg, cancelableArg, defaultScopedFromEventType(eventType), monotonicallyIncreasingTime())
{
}
Event::Event(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg, double platformTimeStamp)
+ : Event(eventType, canBubbleArg, cancelableArg, defaultScopedFromEventType(eventType), platformTimeStamp)
+{
+}
+
+Event::Event(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg, bool scoped)
+ : Event(eventType, canBubbleArg, cancelableArg, scoped, monotonicallyIncreasingTime())
+{
+}
+
+Event::Event(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg, bool scoped, double platformTimeStamp)
: m_type(eventType)
, m_canBubble(canBubbleArg)
, m_cancelable(cancelableArg)
+ , m_scoped(scoped)
, m_propagationStopped(false)
, m_immediatePropagationStopped(false)
, m_defaultPrevented(false)
@@ -63,7 +87,7 @@ Event::Event(const AtomicString& eventType, bool canBubbleArg, bool cancelableAr
}
Event::Event(const AtomicString& eventType, const EventInit& initializer)
- : Event(eventType, initializer.bubbles(), initializer.cancelable())
+ : Event(eventType, initializer.bubbles(), initializer.cancelable(), initializer.scoped())
{
}

Powered by Google App Engine
This is Rietveld 408576698