Chromium Code Reviews| 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..7681ff6929df74381bb55e1dc1d78f590e0af5af 100644 |
| --- a/third_party/WebKit/Source/core/events/Event.cpp |
| +++ b/third_party/WebKit/Source/core/events/Event.cpp |
| @@ -34,20 +34,47 @@ |
| namespace blink { |
| +static bool defaultScopedFromEventType(const AtomicString& eventType) |
| +{ |
| + if (eventType == EventTypeNames::abort |
|
hayato
2016/01/15 03:59:52
You do not have to use "if (xxx) { return true; }
yuzuchan
2016/01/15 05:32:27
Done.
|
| + || eventType == EventTypeNames::change |
| + || eventType == EventTypeNames::error |
| + || eventType == EventTypeNames::load |
| + || eventType == EventTypeNames::reset |
| + || eventType == EventTypeNames::resize |
| + || eventType == EventTypeNames::scroll |
| + || eventType == EventTypeNames::select |
| + || eventType == EventTypeNames::selectstart) { |
| + return true; |
| + } |
| + return false; |
| +} |
| + |
| Event::Event() |
| : Event("", 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 +90,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()) |
| { |
| } |